-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
github: factor out platform rebase into own workflow
Factor out the platform branch rebase job into its own workflow which is triggered explicitly by a repository-dispatch event. We can then re-trigger the rebase job after the proofs have succeeded on the rebased branch to confirm that everything is now up to date and get a successful rebase test run after everything has completed. Signed-off-by: Gerwin Klein <[email protected]>
- Loading branch information
Showing
2 changed files
with
56 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -152,39 +152,13 @@ jobs: | |
env: | ||
GH_SSH: ${{ secrets.CI_SSH }} | ||
|
||
# Automatically rebase platform branches on pushes to master. | ||
# This workflow here on the master branch attempts a git rebase of the platform | ||
# branches listed in the build matrix below. If the rebase succeeds, the rebased | ||
# branch is pushed under the name `<branch>-rebased`. This triggers the build | ||
# workflow on the `<branch>-rebased` branch, which will run the proofs. If the | ||
# proofs succeed, the `<branch>-rebased` branch is force-pushed over | ||
# `<branch>`, becoming the new platform branch. | ||
rebase: | ||
name: Rebase platform branches | ||
# Automatically rebase platform branches on pushes to master. | ||
trigger-rebase: | ||
name: Trigger platform branch rebase | ||
if: github.ref == 'refs/heads/master' | ||
runs-on: ubuntu-latest | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
branch: [imx8-fpu-ver] | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
- name: Trigger rebase | ||
uses: peter-evans/repository-dispatch@v3 | ||
with: | ||
ref: ${{ matrix.branch }} | ||
path: l4v-${{ matrix.branch }} | ||
fetch-depth: 0 | ||
# needed to trigger push actions on the -rebased branch | ||
# (implict GITHUB_TOKEN does not trigger further push actions). | ||
token: ${{ secrets.PRIV_REPO_TOKEN }} | ||
- name: Rebase | ||
run: | | ||
cd l4v-${{ matrix.branch }} | ||
git config --global user.name "seL4 CI" | ||
git config --global user.email "[email protected]" | ||
git rebase origin/master | ||
git status | ||
- name: Push | ||
run: | | ||
cd l4v-${{ matrix.branch }} | ||
git push -f origin HEAD:${{ matrix.branch }}-rebased | ||
event-type: rebase |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
# Copyright 2024 Proofcraft Pty Ltd | ||
# | ||
# SPDX-License-Identifier: BSD-2-Clause | ||
|
||
# On repository dispatch event rebase platform branches. | ||
|
||
name: Rebase | ||
|
||
on: | ||
repository_dispatch: | ||
types: | ||
- rebase | ||
# for testing: | ||
workflow_dispatch: | ||
|
||
# This workflow here on the master branch attempts a git rebase of the platform | ||
# branches listed in the build matrix below. If the rebase succeeds, the rebased | ||
# branch is pushed under the name `<branch>-rebased`. This triggers the build | ||
# workflow on the `<branch>-rebased` branch, which will run the proofs. If the | ||
# proofs succeed, the `<branch>-rebased` branch is force-pushed over | ||
# `<branch>`, becoming the new platform branch. | ||
jobs: | ||
rebase: | ||
name: Rebase platform branches | ||
runs-on: ubuntu-latest | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
branch: [imx8-fpu-ver] | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ matrix.branch }} | ||
path: l4v-${{ matrix.branch }} | ||
fetch-depth: 0 | ||
# needed to trigger push actions on the -rebased branch | ||
# (implict GITHUB_TOKEN does not trigger further push actions). | ||
token: ${{ secrets.PRIV_REPO_TOKEN }} | ||
- name: Rebase | ||
run: | | ||
cd l4v-${{ matrix.branch }} | ||
git config --global user.name "seL4 CI" | ||
git config --global user.email "[email protected]" | ||
git rebase origin/master | ||
git status | ||
- name: Push | ||
run: | | ||
cd l4v-${{ matrix.branch }} | ||
git push -f origin HEAD:${{ matrix.branch }}-rebased |