Test/binary canaries

.github/workflows/automated-updates-to-sam-cli.yml

@@ -71,12 +71,6 @@ jobs:
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
-
-      - uses: actions/setup-python@v4 # used for make update-reproducible-reqs below
-        with:
-          python-version: |
-            3.8
-            3.11
 
       - name: Update aws-sam-translator & commit
         run: |
@@ -90,7 +84,7 @@ jobs:
           SAM_T_PRE_VERSION=$(grep "aws-sam-translator=" requirements/base.txt)
           echo "SAM-T pre version is $SAM_T_PRE_VERSION"
           git reset --hard develop
-          sed -i "s/$SAM_T_PRE_VERSION/aws-sam-translator==$SAM_T_CUR_VERSION/g" requirements/base.txt; make update-reproducible-reqs
+          sed -i "s/$SAM_T_PRE_VERSION/aws-sam-translator==$SAM_T_CUR_VERSION/g" requirements/base.txt
           cp -r ../serverless-application-model/tests/translator/input ./tests/functional/commands/validate/lib/models
           git status
           git diff --quiet && exit 0 # exit if there is no change
@@ -129,12 +123,6 @@ jobs:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
 
-      - uses: actions/setup-python@v4 # used for make update-reproducible-reqs below
-        with:
-          python-version: |
-            3.8
-            3.11
-
       - name: Upgrade aws_lambda_builders & commit
         run: |
           git config --global user.email "[email protected]"
@@ -147,7 +135,7 @@ jobs:
           BUILDERS_PRE_VERSION=$(grep "aws_lambda_builders=" requirements/base.txt)
           echo "Lambda Builders pre version is $BUILDERS_PRE_VERSION"
           git reset --hard develop
-          sed -i "s/$BUILDERS_PRE_VERSION/aws_lambda_builders==$BUILDERS_CUR_VERSION/g" requirements/base.txt; make update-reproducible-reqs
+          sed -i "s/$BUILDERS_PRE_VERSION/aws_lambda_builders==$BUILDERS_CUR_VERSION/g" requirements/base.txt
           git status
           git diff --quiet && exit 0 # exit if there is no change
           echo "is_new_lambda_builders=1" >> $GITHUB_ENV # set env variable for next step run decision

.github/workflows/update-reproducibles.yml

@@ -0,0 +1,42 @@
+name: Update reproducible requirements
+on:
+  pull_request:
+    branches: [develop]
+    paths:
+      - requirements/base.txt # run this GHA only if requirements file is changed
+
+jobs:
+  update-reqs:
+    permissions:
+      pull-requests: write
+      contents: write
+    if: github.repository_owner == 'aws'
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            python: 3.11
+            target: update-reproducible-linux-reqs
+          - os: macos-latest
+            python: 3.8
+            target: update-reproducible-mac-reqs
+          - os: windows-latest
+            python: 3.8
+            target: update-reproducible-win-reqs
+      max-parallel: 1
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+      - run: make ${{ matrix.target }}
+      - name: Push changes
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "GitHub Action"
+          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+          git commit -am "Update reproducibles: ${{ matrix.target }}" || echo "nothing to commit"
+          git push

Makefile

@@ -70,4 +70,13 @@ update-reproducible-mac-reqs:
 	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
 
+# note that this should be run on a windows environment with python3.8 as default interpreter
+update-reproducible-win-reqs:
+	python -m venv venv-update-reproducible-win
+	.\venv-update-reproducible-win\Scripts\activate
+	pip install --upgrade pip-tools pip
+	pip install -r requirements\base.txt
+	pip-compile --generate-hashes --allow-unsafe -o requirements\reproducible-win.txt
+
+
 update-reproducible-reqs: update-reproducible-linux-reqs update-reproducible-mac-reqs

appveyor-windows-binary.yml

@@ -22,7 +22,6 @@ configuration:
 
 environment:
   AWS_DEFAULT_REGION: us-east-1
-  SAM_CLI_DEV: 1
   CARGO_LAMBDA_VERSION: "v0.17.1"
 
   # Python uses $TMPDIR envvar to find root of tempdir
@@ -140,7 +139,7 @@ install:
     Start-Process 'C:\\Windows\\System32\\msiexec.exe' -ArgumentList '/i aws-sam-cli-installer.msi /qn /norestart' -wait -PassThru;
     Rename-Item -Path 'C:\\Program Files\\Amazon\\AWSSAMCLI_NIGHTLY\\bin\\sam-nightly.cmd' -NewName 'C:\\Program Files\\Amazon\\AWSSAMCLI_NIGHTLY\\bin\\sam.cmd'
   "
-  - 'set PATH=C:\Program Files\Amazon\AWSSAMCLI\bin\;%PATH%'
+  - 'set PATH=C:\Program Files\Amazon\AWSSAMCLI_NIGHTLY\bin\;%PATH%'
   - 'sam --version'
 
   # Echo final Path