Skip to content

Commit 1e908d8

Browse files
committed
[build] ensure rust updates happen in same release prep branch as the other updates
1 parent 31cf838 commit 1e908d8

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/pre-release.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,21 @@ jobs:
3030
run: |
3131
git config --local user.email "[email protected]"
3232
git config --local user.name "Selenium CI Bot"
33-
if git rev-parse --verify release-${{ github.event.inputs.version }} >/dev/null 2>&1; then
34-
git branch -D release-${{ github.event.inputs.version }}
33+
if git rev-parse --verify release-preparation-${{ github.event.inputs.version }} >/dev/null 2>&1; then
34+
git branch -D release-preparation-${{ github.event.inputs.version }}
3535
fi
36-
git checkout -b release-${{ github.event.inputs.version }}
36+
git checkout -b release-preparation-${{ github.event.inputs.version }}
3737
- name: Update Rust Version
3838
run: |
3939
./go rust:version ${{ github.event.inputs.version }}
40-
./go rust:version:commit
40+
./go rust:changelog
41+
- name: Commit Rust updates
42+
run: git commit -m "update selenium manager version and rust changelog"
4143
- name: Push changes
4244
uses: ad-m/github-push-action@master
4345
with:
4446
github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
45-
branch: release-${{ github.event.inputs.version }}
47+
branch: release-preparation-${{ github.event.inputs.version }}
4648
force: true
4749

4850
selenium-manager:
@@ -51,7 +53,7 @@ jobs:
5153
uses: ./.github/workflows/ci-rust.yml
5254
with:
5355
release: true
54-
branch: release-${{ github.event.inputs.version }}
56+
branch: release-preparation-${{ github.event.inputs.version }}
5557
secrets:
5658
SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
5759

Rakefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,6 @@ namespace :all do
11921192
Rake::Task['node:version'].invoke(version)
11931193
Rake::Task['py:version'].invoke(version)
11941194
Rake::Task['dotnet:version'].invoke(version)
1195-
Rake::Task['rust:version'].invoke(version)
11961195

11971196
unless version == 'nightly'
11981197
Rake::Task['all:changelogs'].invoke
@@ -1214,7 +1213,6 @@ namespace :all do
12141213
Rake::Task['node:changelog'].invoke
12151214
Rake::Task['py:changelog'].invoke
12161215
Rake::Task['dotnet:changelog'].invoke
1217-
Rake::Task['rust:changelog'].invoke
12181216
end
12191217
end
12201218

0 commit comments

Comments
 (0)