Skip to content
This repository has been archived by the owner on Aug 14, 2024. It is now read-only.

Commit

Permalink
Add rebase script
Browse files Browse the repository at this point in the history
This brings us in sync with the latest release more or less
automatically, if there are no merge conflicts that can't be
automatically resolved.
  • Loading branch information
Mark-Simulacrum committed Mar 12, 2023
1 parent ac62d40 commit 681554a
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions rebase.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash

set -euxo pipefail

OLD_TAG=$1
NEW_TAG=$2

git fetch upstream
git fetch origin

git reset --hard origin/main

# this should fail, that's expected
git rebase --onto $NEW_TAG $OLD_TAG $OLD_TAG-rust1 || true

echo ${NEW_TAG/v/}-rust1 > src/runnerversion
echo ${NEW_TAG/v/}-rust1 > releaseVersion
echo "Fork of the GitHub Actions runner used by the Rust Infrastructure Team." > releaseNote.md
git add src/runnerversion releaseVersion releaseNote.md
git rebase --continue
git push -f origin HEAD:main

0 comments on commit 681554a

Please sign in to comment.