Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deploy decumentation after backport #766

Merged
merged 2 commits into from
Mar 9, 2022
Merged

Fix deploy decumentation after backport #766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1e082b
Fix deploy decumentation after backport
lwronski Mar 8, 2022
5626cad
Add merge commit message
lwronski Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 gh-actions
git config user.email actions@github.com
git checkout stable
git merge main -m "Back port of documentation changes to stable"
git push origin stable

launchers:
timeout-minutes: 20
Expand Down