From b1e082b0143edfb5a814a16e5c23a37609c43215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wro=C5=84ski?= Date: Wed, 9 Mar 2022 00:01:04 +0100 Subject: [PATCH 1/2] Fix deploy decumentation after backport --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d81d1071e8..ac733d1754 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -299,6 +299,7 @@ jobs: with: fetch-depth: 0 submodules: true + ssh-key: ${{ secrets.SSH_PRIVATE_KEY_SCALA_CLI }} - uses: coursier/cache-action@v6.3 - uses: VirtusLab/scala-cli-setup@267af2f1ed4911180b4bb25619ca4a586753cbd1 with: @@ -316,13 +317,12 @@ jobs: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - name: Update stable branch if: env.SHOULD_PUBLISH == 'true' && startsWith(github.ref, 'refs/tags/v') - uses: devmasx/merge-branch@8b86512c768bec19827894f0a39a776809668189 - with: - type: now - message: 'Back port of documentation changes to stable' - from_branch: main - target_branch: stable - github_token: ${{ secrets.GITHUB_TOKEN }} + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git checkout stable + git merge main + git push origin stable launchers: timeout-minutes: 20 From 5626cadc99566a906069373590cfca6d9d71f305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wro=C5=84ski?= Date: Wed, 9 Mar 2022 09:54:39 +0100 Subject: [PATCH 2/2] Add merge commit message --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac733d1754..775f943a18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -318,10 +318,10 @@ jobs: - name: Update stable branch if: env.SHOULD_PUBLISH == 'true' && startsWith(github.ref, 'refs/tags/v') run: | - git config user.name github-actions - git config user.email github-actions@github.com + git config user.name gh-actions + git config user.email actions@github.com git checkout stable - git merge main + git merge main -m "Back port of documentation changes to stable" git push origin stable launchers: