From be5e10438e5424ce087fab8d8981b952d313057a Mon Sep 17 00:00:00 2001 From: Guillaume Delacour Date: Tue, 15 Feb 2022 10:15:35 +0100 Subject: [PATCH] Rename branch to main (#55) --- .../workflows/{deploy-master.yml => deploy-main.yml} | 8 ++++---- .github/workflows/deploy.yml | 12 ++++++------ .github/workflows/linter.yml | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) rename .github/workflows/{deploy-master.yml => deploy-main.yml} (81%) diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-main.yml similarity index 81% rename from .github/workflows/deploy-master.yml rename to .github/workflows/deploy-main.yml index f4a1ddc..b8fff02 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-main.yml @@ -3,7 +3,7 @@ name: Trigger invocation on: push: branches: - - 'master' + - 'main' jobs: build-and-deploy: @@ -16,8 +16,8 @@ jobs: - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@master with: - role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} - aws-region: ${{ secrets.AWS_REGION }} + role-to-assume: ${{secrets.AWS_ROLE_TO_ASSUME}} + aws-region: ${{secrets.AWS_REGION}} - name: Invoke Lambda run: | @@ -26,4 +26,4 @@ jobs: --function-name aws-managed-services-versions-fetch \ --invocation-type Event \ --payload '{ "output_file": "index.html" }' \ - response.json \ No newline at end of file + response.json diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fd6795f..ea4e406 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,7 +2,7 @@ name: deploy to lambda on: push: branches-ignore: - - 'master' + - 'main' jobs: build: @@ -24,7 +24,7 @@ jobs: - name: Install Python uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} + python-version: ${{matrix.python-version}} - name: Build zip run: | @@ -37,18 +37,18 @@ jobs: - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@master with: - role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} - aws-region: ${{ secrets.AWS_REGION }} + role-to-assume: ${{secrets.AWS_ROLE_TO_ASSUME}} + aws-region: ${{secrets.AWS_REGION}} - name: put zip on S3 run: | - aws s3 cp ./lambda.zip s3://${{ secrets.AWS_S3_BUCKET }}/ + aws s3 cp ./lambda.zip s3://${{secrets.AWS_S3_BUCKET}}/ - name: default deploy run: | aws lambda update-function-code \ --function-name aws-managed-services-versions-fetch \ - --s3-bucket ${{ secrets.AWS_S3_BUCKET }} \ + --s3-bucket ${{secrets.AWS_S3_BUCKET}} \ --s3-key lambda.zip - name: Invoke Lambda diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index e0e3c1f..436f0b1 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -15,7 +15,7 @@ name: Lint Code Base ############################# on: push: - branches-ignore: [master] + branches-ignore: [main] ############### # Set the Job # @@ -47,6 +47,6 @@ jobs: uses: github/super-linter@v4 env: VALIDATE_ALL_CODEBASE: false - DEFAULT_BRANCH: master + DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_PYTHON_FLAKE8: false