diff --git a/.github/workflows/document-release.yml b/.github/workflows/document-release.yml index 1e9069eadb9c8..e727c0ff0b273 100644 --- a/.github/workflows/document-release.yml +++ b/.github/workflows/document-release.yml @@ -16,7 +16,6 @@ on: jobs: update-documentation: - if: github.repository_owner == 'seleniumhq' runs-on: ubuntu-latest steps: - name: Checkout repo diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 42d6a0e0c0f31..ef4f2a30aa9cb 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -16,14 +16,14 @@ on: - early-stable jobs: - update-rust: - name: Update Rust Version + update-files: + name: Update Files runs-on: ubuntu-latest steps: - - name: "Checkout repo" + - name: "Checkout project" uses: actions/checkout@v4 with: - persist-credentials: false + persist-credentials: true fetch-depth: 0 fetch-tags: true - name: "Prep git" @@ -34,39 +34,9 @@ jobs: git branch -D release-${{ github.event.inputs.version }} fi git checkout -b release-${{ github.event.inputs.version }} - - name: Update Rust Version - run: | - ./go rust:version - ./go rust:version:commit - - name: Push changes - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.SELENIUM_CI_TOKEN }} - branch: release-${{ github.event.inputs.version }} - force: true - - selenium-manager: - name: Release Selenium Manager - needs: update-rust - uses: ./.github/workflows/ci-rust.yml - with: - release: true - branch: release-${{ github.event.inputs.version }} - secrets: - SELENIUM_CI_TOKEN: ${{ secrets.SELENIUM_CI_TOKEN }} - - update-files: - name: Update Files - runs-on: ubuntu-latest - needs: selenium-manager - steps: - - name: "Checkout project" - uses: actions/checkout@v4 - with: - persist-credentials: false - fetch-depth: 0 - fetch-tags: true - ref: release-${{ github.event.inputs.version }} + git push origin release-${{ github.event.inputs.version }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Use the GITHUB_TOKEN for authentication - name: Install Ruby uses: ruby/setup-ruby@v1 with: @@ -76,8 +46,8 @@ jobs: run: | git config --local user.email "selenium-ci@users.noreply.github.com" git config --local user.name "Selenium CI Bot" - - name: Undo rust changelog commit - run: git reset HEAD~1 +# - name: Undo rust changelog commit +# run: git reset HEAD~1 - name: Update everything including early release CDP if: ${{ github.event.inputs.chrome_channel == 'early-stable' }} run: ./go all:prepare[${{ github.event.inputs.version }},Beta] @@ -91,7 +61,7 @@ jobs: author: Selenium CI Bot delete-branch: true branch: release-preparation-${{ github.event.inputs.version }} - base: trunk + base: temp_trunk title: "[build] Prepare for release of Selenium ${{ github.event.inputs.version }}" body: | **Warning: Manually update the changelogs before merging** diff --git a/.github/workflows/stage-release.yml b/.github/workflows/stage-release.yml index 1ff0159cf76f9..c121b0a132139 100644 --- a/.github/workflows/stage-release.yml +++ b/.github/workflows/stage-release.yml @@ -11,7 +11,6 @@ jobs: github-release: if: > github.event.pull_request.merged == true && - github.repository_owner == 'seleniumhq' && startsWith(github.event.pull_request.head.ref, 'release-preparation-') runs-on: ubuntu-latest outputs: