diff --git a/.github/workflows/after-release.yml b/.github/workflows/after-release.yml deleted file mode 100644 index 402ea2e..0000000 --- a/.github/workflows/after-release.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Merge dev into production after release - -on: - workflow_dispatch: - workflow_call: - secrets: - ga_token: - required: true - -jobs: - rebase-production: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 - token: ${{ secrets.ga_token }} - - - name: Configure Git - run: | - git config --global user.email "actions@github.com" - git config --global user.name "GitHub Actions" - - - name: Rebase production on dev - run: | - git checkout production - git rebase dev --strategy-option=theirs - env: - GITHUB_TOKEN: ${{ secrets.ga_token }} - - - name: Push changes - run: | - git push origin production --force - env: - GITHUB_TOKEN: ${{ secrets.ga_token }} diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 5fd96f2..74417ec 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -1,4 +1,4 @@ -name: 🤖 Prepare for Release 🚀 +name: 🤖 Release Process 🚀 on: workflow_call: @@ -42,3 +42,13 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.ga_token }} run: gh release upload ${{ steps.release.outputs.tag_name }} ${{github.workspace}}/$GITHUB_REPO_SLUG-$GITHUB_TAG.zip --clobber + - name: Trigger staging bedrock updates + if: ${{ steps.release.outputs.release_created }} + uses: pressbooks/composer-autoupdate-bedrock@feat/trigger-after-release + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_SNS_ARN_DEV: ${{ secrets.AWS_SNS_ARN_DEV }} + AWS_SNS_ARN_STAGING: ${{ secrets.AWS_SNS_ARN_STAGING }} + INPUT_TRIGGERED_BY: ${{ github.repository }} + INPUT_BRANCH: ${{ github.ref }}