Skip to content

Commit

Permalink
Merge branch 'feat/dotnet8' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
hawflau authored Dec 14, 2023
2 parents 3cec175 + 46bb95c commit f712e18
Show file tree
Hide file tree
Showing 17 changed files with 479 additions and 272 deletions.
118 changes: 76 additions & 42 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,75 +1,109 @@
area/package:
- samcli/commands/package/*
- samcli/commands/package/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/package/*
- samcli/commands/package/**/*

area/local/invoke:
- samcli/commands/local/invoke/*
- samcli/commands/local/invoke/**/*
- samcli/local/*
- samcli/local/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/local/invoke/*
- samcli/commands/local/invoke/**/*
- samcli/local/*
- samcli/local/**/*

area/pipeline:
- samcli/commands/pipeline/*
- samcli/commands/pipeline/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/pipeline/*
- samcli/commands/pipeline/**/*

area/deploy:
- samcli/commands/deploy/*
- samcli/commands/deploy/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/deploy/*
- samcli/commands/deploy/**/*

area/local/start-api:
- samcli/commands/local/start-api/*
- samcli/commands/local/start-api/**/*
- samcli/local/*
- samcli/local/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/local/start-api/*
- samcli/commands/local/start-api/**/*
- samcli/local/*
- samcli/local/**/*

area/local/start-invoke:
- samcli/commands/local/start-invoke/*
- samcli/commands/local/start-invoke/**/*
- samcli/local/*
- samcli/local/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/local/start-invoke/*
- samcli/commands/local/start-invoke/**/*
- samcli/local/*
- samcli/local/**/*

area/local/generate-event:
- samcli/commands/local/generate-event/*
- samcli/commands/local/generate-event/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/local/generate-event/*
- samcli/commands/local/generate-event/**/*

area/init:
- samcli/commands/init/*
- samcli/commands/init/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/init/*
- samcli/commands/init/**/*

area/delete:
- samcli/commands/delete/*
- samcli/commands/delete/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/delete/*
- samcli/commands/delete/**/*

area/integration-tests:
- test/integration/*
- test/integration/**/*
- changed-files:
- any-glob-to-any-file:
- test/integration/*
- test/integration/**/*

area/publish:
- samcli/commands/publish/*
- samcli/commands/publish/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/publish/*
- samcli/commands/publish/**/*

area/sync:
- samcli/commands/sync/*
- samcli/commands/sync/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/sync/*
- samcli/commands/sync/**/*

area/validate:
- samcli/commands/validate/*
- samcli/commands/validate/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/validate/*
- samcli/commands/validate/**/*

area/build:
- samcli/commands/build/*
- samcli/commands/build/**/*
- samcli/lib/build/*
- samcli/lib/build/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/build/*
- samcli/commands/build/**/*
- samcli/lib/build/*
- samcli/lib/build/**/*

area/logs:
- samcli/commands/logs/*
- samcli/commands/logs/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/logs/*
- samcli/commands/logs/**/*

area/traces:
- samcli/commands/traces/*
- samcli/commands/traces/**/*
- changed-files:
- any-glob-to-any-file:
- samcli/commands/traces/*
- samcli/commands/traces/**/*

area/schema:
- schema/*
- schema/**/*
- changed-files:
- any-glob-to-any-file:
- schema/*
- schema/**/*
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- "3.11"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md" # prevent Bug_report.md from being renamed or deleted
Expand All @@ -76,7 +76,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
name: Install Python 3.11
with:
python-version: 3.11
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
- "tests/integration/docs"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
# set last version as the one in matrix to make it default
python-version: |
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
- "3.11"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Init samdev
Expand All @@ -240,7 +240,7 @@ jobs:
- windows-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
# These are the versions of Python that correspond to the supported Lambda runtimes
python-version: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
apply-internal-external-label:
Expand All @@ -27,7 +27,7 @@ jobs:
'aws-sam-cli-bot',
'hawflau', 'mndeveci',
'mildaniel', 'marekaiv',
'lucashuy', 'hnnasit', 'jysheng123', 'bentvelj', 'sidhujus', dependabot[bot]'
'lucashuy', 'hnnasit', 'jysheng123', 'bentvelj', 'sidhujus', 'dependabot[bot]'
]
if (maintainers.includes(context.payload.sender.login)) {
github.rest.issues.addLabels({
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-reproducibles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- run: make ${{ matrix.target }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate_pyinstaller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.8"
- name: Set up Go
uses: actions/setup-go@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ update-reproducible-linux-reqs:
venv-update-reproducible-linux/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-linux.txt

update-reproducible-mac-reqs:
python3.11 -m venv venv-update-reproducible-mac
python3.8 -m venv venv-update-reproducible-mac
venv-update-reproducible-mac/bin/pip install --upgrade pip-tools pip
venv-update-reproducible-mac/bin/pip install -r requirements/base.txt
venv-update-reproducible-mac/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-mac.txt
Expand Down
6 changes: 3 additions & 3 deletions installer/pyinstaller/build-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ if [ "$python_library_zip_filename" = "" ]; then
fi

if [ "$openssl_version" = "" ]; then
openssl_version="1.1.1t";
openssl_version="1.1.1o";
fi

if [ "$python_version" = "" ]; then
python_version="3.11.3";
python_version="3.8.13";
fi

if ! [ "$build_binary_name" = "" ]; then
Expand Down Expand Up @@ -97,7 +97,7 @@ sudo make install
cd ..

echo "Installing Python Libraries"
/usr/local/bin/python3.11 -m venv venv
/usr/local/bin/python3.8 -m venv venv
./venv/bin/pip install --upgrade pip
./venv/bin/pip install -r src/requirements/reproducible-mac.txt

Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ regex!=2021.10.8
tzlocal==5.2

#Adding cfn-lint dependency for SAM validate
cfn-lint~=0.83.4
cfn-lint~=0.83.5

# Type checking boto3 objects
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.33.5
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.0
2 changes: 1 addition & 1 deletion requirements/pre-dev.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruff==0.1.7
ruff==0.1.8
Loading

0 comments on commit f712e18

Please sign in to comment.