From f29fc6868a5a7e3962d0dc376312222aa09338eb Mon Sep 17 00:00:00 2001 From: daquintero Date: Tue, 5 Mar 2024 14:14:01 +0100 Subject: [PATCH] FEAT: Update release flow :rocket: --- .github/workflows/sync-to-proxy-repo.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-to-proxy-repo.yaml b/.github/workflows/sync-to-proxy-repo.yaml index a6d02754..e5a5a56f 100644 --- a/.github/workflows/sync-to-proxy-repo.yaml +++ b/.github/workflows/sync-to-proxy-repo.yaml @@ -2,7 +2,7 @@ name: sync-to-proxy-repo on: push: branches: - - main + - latest - develop workflow_dispatch: inputs: @@ -29,7 +29,7 @@ jobs: echo "::set-output name=env::dev" echo "ENV=dev" >> $GITHUB_ENV fi - if test "${{ github.event_name }}" = 'push' -a "${{ github.ref }}" = 'refs/heads/main' + if test "${{ github.event_name }}" = 'push' -a "${{ github.ref }}" = 'refs/heads/latest' then echo "::set-output name=env::prod" echo "ENV=prod" >> $GITHUB_ENV @@ -50,6 +50,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Update latest from develop to upload to dev environment + if: contains(${{ github.ref }}, 'develop') == true + uses: everlytic/branch-merge@1.1.2 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + source_ref: ${{ github.ref }} + target_branch: "latest" + commit_message_template: 'UPLOAD: :shipit: :boom: :tada: Merged develop into latest' - uses: JamesIves/github-pages-deploy-action@v4 with: folder: docs