Skip to content

Commit 7b7ae95

Browse files
committed
[build] update rust version to build selenium manager, then delete branch
1 parent 64b58f8 commit 7b7ae95

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

.github/workflows/pre-release.yml

+19-8
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,24 @@ jobs:
2525
with:
2626
persist-credentials: false
2727
fetch-depth: 0
28-
fetch-tags: true
2928
- name: "Prep git"
3029
run: |
3130
git config --local user.email "[email protected]"
3231
git config --local user.name "Selenium CI Bot"
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 }}
32+
if git rev-parse --verify rust-release-${{ github.event.inputs.version }} >/dev/null 2>&1; then
33+
git branch -D rust-release-${{ github.event.inputs.version }}
3534
fi
36-
git checkout -b release-preparation-${{ github.event.inputs.version }}
35+
git checkout -b rust-release-${{ github.event.inputs.version }}
3736
- name: Update Rust Version
3837
run: |
3938
./go rust:version ${{ github.event.inputs.version }}
40-
./go rust:changelog
4139
- name: Commit Rust updates
4240
run: git commit -m "update selenium manager version and rust changelog"
4341
- name: Push changes
4442
uses: ad-m/github-push-action@master
4543
with:
4644
github_token: ${{ secrets.SELENIUM_CI_TOKEN }}
47-
branch: release-preparation-${{ github.event.inputs.version }}
45+
branch: rust-release-${{ github.event.inputs.version }}
4846
force: true
4947

5048
selenium-manager:
@@ -53,10 +51,23 @@ jobs:
5351
uses: ./.github/workflows/ci-rust.yml
5452
with:
5553
release: true
56-
branch: release-preparation-${{ github.event.inputs.version }}
54+
branch: rust-release-${{ github.event.inputs.version }}
5755
secrets:
5856
SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }}
5957

58+
cleanup-rust-branch:
59+
name: Cleanup Rust Branch
60+
needs: selenium-manager
61+
runs-on: ubuntu-latest
62+
steps:
63+
- name: "Checkout repo"
64+
uses: actions/checkout@v4
65+
with:
66+
token: ${{ secrets.SELENIUM_CI_TOKEN }}
67+
- name: "Delete rust release branch"
68+
run: |
69+
git push origin --delete rust-release-${{ github.event.inputs.version }}
70+
6071
update-files:
6172
name: Update Files
6273
runs-on: ubuntu-latest
@@ -68,7 +79,7 @@ jobs:
6879
persist-credentials: false
6980
fetch-depth: 0
7081
fetch-tags: true
71-
ref: release-preparation-${{ github.event.inputs.version }}
82+
ref: trunk
7283
- name: Install Ruby
7384
uses: ruby/setup-ruby@v1
7485
with:

Rakefile

+2
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,7 @@ 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)
11951196

11961197
unless version == 'nightly'
11971198
Rake::Task['all:changelogs'].invoke
@@ -1213,6 +1214,7 @@ namespace :all do
12131214
Rake::Task['node:changelog'].invoke
12141215
Rake::Task['py:changelog'].invoke
12151216
Rake::Task['dotnet:changelog'].invoke
1217+
Rake::Task['rust:changelog'].invoke
12161218
end
12171219
end
12181220

0 commit comments

Comments
 (0)