diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 519051c..0f7f908 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,10 +11,6 @@ on: description: 'Push a new release semantic versioned tag to the selected branch' required: false type: boolean - v1-node16: - description: 'Merge the tip of the branch selected into v1-node16' - required: false - type: boolean jobs: v1: @@ -47,36 +43,6 @@ jobs: git config --global user.name "GitHub Actions" git tag -f -a v1 -m "Update v1 to ${{ github.sha }}" git push https://${{ env.OSDS_ACCESS_TOKEN }}@github.com/aws-actions/configure-aws-credentials.git -f --tags - v1-node16: - name: Merge the master into v1-node16 - if: ${{ v1-node16 }} - timeout-minutes: 15 - steps: - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1-node16 - with: - aws-region: us-west-2 - role-to-assume: ${{ secrets.SECRETS_AWS_ROLE_TO_ASSUME }} - role-session-name: SecretsManagerFetch - role-duration-seconds: 900 - - name: Get bot user token - uses: aws-actions/aws-secretsmanager-get-secrets@v1 - with: - parse-json-secrets: true - secret-ids: | - OSDS,arn:aws:secretsmanager:us-west-2:294535624312:secret:github-aws-sdk-osds-automation-ZHNalp - - name: Checkout repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 - ref: ${{ v1-node16 }} - token: ${{ env.OSDS_ACCESS_TOKEN }} - - name: Push new merge commit - run: | - echo "::add-mask::${{ env.OSDS_ACCESS_TOKEN }}" - git config --global user.name "GitHub Actions" - git merge ${{ github.ref_name }} -m 'Merge ${{ github.ref_name }} into v1-node16' - git push https://${{ env.OSDS_ACCESS_TOKEN }}@github.com/aws-actions/configure-aws-credentials.git v1-versioned: description: 'Push a new semantic version tag' if: ${{ v1-versioned }} @@ -112,4 +78,4 @@ jobs: echo "::add-mask::${{ env.OSDS_ACCESS_TOKEN }}" git config --global user.name "GitHub Actions" git tag -f -a ${{ steps.semver.version_tag }} -m "New ${{ steps.semver.version_tag }} release" - git push https://${{ env.OSDS_ACCESS_TOKEN }}@github.com/aws-actions/configure-aws-credentials.git -f --tags \ No newline at end of file + git push https://${{ env.OSDS_ACCESS_TOKEN }}@github.com/aws-actions/configure-aws-credentials.git -f --tags