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

ci: add rebase on end of release process #361

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ci: add rebase on end of release process #361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions ...hub/workflows/push_branches.workflow.yaml → .github/workflows/release.workflow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Push checks
name: Release

on:
push:
Expand All @@ -16,10 +16,10 @@ jobs:
pull-requests: write
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "lts/*"
registry-url: "https://registry.npmjs.org"
Expand All @@ -38,6 +38,12 @@ jobs:
SEMANTIC_RELEASE_SLACK_WEBHOOK: ${{ secrets.SEMANTIC_RELEASE_SLACK_WEBHOOK }}
run: npx semantic-release

- name: Rebase 2-dev (keep linear history)
run: |
git fetch --no-tags origin 2-dev:2-dev
git rebase ${GITHUB_REF_NAME} 2-dev
git push origin 2-dev

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will not work since it require a force push (commit IDs are refresh each time you rebase). Note that the CI user will become the author/co-author of each rebased commit

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here that just, add the commit chore(release): x.x.x-beta.y [skip ci] created by semantic-release to the dev branch, as what is done in other repositories

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's no force push as it is fast forward in principle

documentation_deploy:
needs: [release-device-manager]
name: Documentation - Deploy
Expand Down
Loading