From e5569b5448d6466a535033e9e5d913c9971639d5 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 15:36:19 +0200 Subject: [PATCH 01/18] Updating nightly version for .NET --- .github/workflows/dotnet-examples.yml | 23 ++++++++++++++++--- .../dotnet/SeleniumDocs/SeleniumDocs.csproj | 8 ------- scripts/latest-nightly-version.ps1 | 9 ++++++++ scripts/latest-nightly-version.sh | 12 ++++++++++ 4 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 scripts/latest-nightly-version.ps1 create mode 100755 scripts/latest-nightly-version.sh diff --git a/.github/workflows/dotnet-examples.yml b/.github/workflows/dotnet-examples.yml index c257d954ea81..e6aa87f05df6 100644 --- a/.github/workflows/dotnet-examples.yml +++ b/.github/workflows/dotnet-examples.yml @@ -56,7 +56,26 @@ jobs: dotnet-version: 6.x source-url: https://nuget.pkg.github.com/seleniumhq/index.json env: - NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + - name: Update Nightly version non-Windows + if: matrix.release == 'nightly' && matrix.os != 'windows-latest' + run: + | + latest_nightly=$(./scripts/latest-nightly-version.sh) + dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly + dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Update Nightly version Windows + if: matrix.release == 'nightly' && matrix.os == 'windows-latest' + shell: pwsh + run: + | + $latest_nightly = ./scripts/latest-nightly-version.ps1 + dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly + dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Set up Java uses: actions/setup-java@v4 with: @@ -70,5 +89,3 @@ jobs: command: | cd examples/dotnet/SeleniumDocs dotnet test - env: - SE_RELEASE: ${{ matrix.release }} diff --git a/examples/dotnet/SeleniumDocs/SeleniumDocs.csproj b/examples/dotnet/SeleniumDocs/SeleniumDocs.csproj index 39d4594238fb..e84da03854bb 100644 --- a/examples/dotnet/SeleniumDocs/SeleniumDocs.csproj +++ b/examples/dotnet/SeleniumDocs/SeleniumDocs.csproj @@ -10,14 +10,6 @@ - - - - - - - - diff --git a/scripts/latest-nightly-version.ps1 b/scripts/latest-nightly-version.ps1 new file mode 100644 index 000000000000..02fde6d7ad48 --- /dev/null +++ b/scripts/latest-nightly-version.ps1 @@ -0,0 +1,9 @@ +$PACKAGE_TYPE = $args[0] +$PACKAGE_NAME = $args[1] + +$PATH_PACKAGES_API = "orgs/seleniumhq/packages/$PACKAGE_TYPE/$PACKAGE_NAME/versions" +$ACCEPT_HEADER = "Accept: application/vnd.github+json" +$VERSION_HEADER = "X-GitHub-Api-Version: 2022-11-28" + +$ghApiCommand = "gh api -H `"$ACCEPT_HEADER`" -H `"$VERSION_HEADER`" $PATH_PACKAGES_API | jq '.[0].name'" +Invoke-Expression -Command $ghApiCommand diff --git a/scripts/latest-nightly-version.sh b/scripts/latest-nightly-version.sh new file mode 100755 index 000000000000..9e1fd4d40726 --- /dev/null +++ b/scripts/latest-nightly-version.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -xe + +PACKAGE_TYPE="$1" +PACKAGE_NAME="$2" + +PATH_PACKAGES_API="orgs/seleniumhq/packages/$PACKAGE_TYPE/$PACKAGE_NAME/versions" +ACCEPT_HEADER="Accept: application/vnd.github+json" +VERSION_HEADER="X-GitHub-Api-Version: 2022-11-28" + +gh api -H "$ACCEPT_HEADER" -H "$VERSION_HEADER" $PATH_PACKAGES_API | jq '.[0].name' From 7c30ad44938408ff2236a84d528cc9dcc5458548 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 15:38:21 +0200 Subject: [PATCH 02/18] Passing arguments --- .github/workflows/dotnet-examples.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-examples.yml b/.github/workflows/dotnet-examples.yml index e6aa87f05df6..7959146d6a01 100644 --- a/.github/workflows/dotnet-examples.yml +++ b/.github/workflows/dotnet-examples.yml @@ -61,7 +61,7 @@ jobs: if: matrix.release == 'nightly' && matrix.os != 'windows-latest' run: | - latest_nightly=$(./scripts/latest-nightly-version.sh) + latest_nightly=$(./scripts/latest-nightly-version.sh nuget Selenium.WebDriver) dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly env: @@ -71,7 +71,7 @@ jobs: shell: pwsh run: | - $latest_nightly = ./scripts/latest-nightly-version.ps1 + $latest_nightly = ./scripts/latest-nightly-version.ps1 nuget Selenium.WebDriver dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.WebDriver --version $latest_nightly dotnet add examples/dotnet/SeleniumDocs/SeleniumDocs.csproj package Selenium.Support --version $latest_nightly env: From 90dd06ecd28b37387de1849c2881d64838baab63 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 15:44:47 +0200 Subject: [PATCH 03/18] Removing quotes from jq response --- scripts/latest-nightly-version.ps1 | 2 +- scripts/latest-nightly-version.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/latest-nightly-version.ps1 b/scripts/latest-nightly-version.ps1 index 02fde6d7ad48..4db90efa291e 100644 --- a/scripts/latest-nightly-version.ps1 +++ b/scripts/latest-nightly-version.ps1 @@ -5,5 +5,5 @@ $PATH_PACKAGES_API = "orgs/seleniumhq/packages/$PACKAGE_TYPE/$PACKAGE_NAME/versi $ACCEPT_HEADER = "Accept: application/vnd.github+json" $VERSION_HEADER = "X-GitHub-Api-Version: 2022-11-28" -$ghApiCommand = "gh api -H `"$ACCEPT_HEADER`" -H `"$VERSION_HEADER`" $PATH_PACKAGES_API | jq '.[0].name'" +$ghApiCommand = "gh api -H `"$ACCEPT_HEADER`" -H `"$VERSION_HEADER`" $PATH_PACKAGES_API | jq -r '.[0].name'" Invoke-Expression -Command $ghApiCommand diff --git a/scripts/latest-nightly-version.sh b/scripts/latest-nightly-version.sh index 9e1fd4d40726..fb538f594ecc 100755 --- a/scripts/latest-nightly-version.sh +++ b/scripts/latest-nightly-version.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -xe +set -e PACKAGE_TYPE="$1" PACKAGE_NAME="$2" @@ -9,4 +9,4 @@ PATH_PACKAGES_API="orgs/seleniumhq/packages/$PACKAGE_TYPE/$PACKAGE_NAME/versions ACCEPT_HEADER="Accept: application/vnd.github+json" VERSION_HEADER="X-GitHub-Api-Version: 2022-11-28" -gh api -H "$ACCEPT_HEADER" -H "$VERSION_HEADER" $PATH_PACKAGES_API | jq '.[0].name' +gh api -H "$ACCEPT_HEADER" -H "$VERSION_HEADER" $PATH_PACKAGES_API | jq -r '.[0].name' From 99d4173812cc7f9f1ce7dbbd227e048ffceb2f5a Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 15:56:14 +0200 Subject: [PATCH 04/18] Updating nightly in JS --- .github/workflows/js-examples.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/js-examples.yml b/.github/workflows/js-examples.yml index d72bc473d7c3..6ca616f97c13 100644 --- a/.github/workflows/js-examples.yml +++ b/.github/workflows/js-examples.yml @@ -92,11 +92,17 @@ jobs: - name: Use Nightly package.json in Ubuntu/macOS if: matrix.release == 'nightly' && matrix.os != 'windows-latest' working-directory: ./examples/javascript - run: mv package.nightly.json package.json + run: + | + latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver) + npm install --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly - name: Use Nightly package.json in Windows if: matrix.release == 'nightly' && matrix.os == 'windows-latest' working-directory: ./examples/javascript - run: Move-Item -Path package.nightly.json -Destination package.json -Force + run: + | + $latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver + npm install --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly - name: Install Requirements working-directory: ./examples/javascript run: npm install From 222809b063b4fba4e43c005ee41f8cf7b9069210 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 15:59:02 +0200 Subject: [PATCH 05/18] Changing working directory --- .github/workflows/js-examples.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/js-examples.yml b/.github/workflows/js-examples.yml index 6ca616f97c13..f20a6f7f1558 100644 --- a/.github/workflows/js-examples.yml +++ b/.github/workflows/js-examples.yml @@ -91,18 +91,16 @@ jobs: registry-url: 'https://npm.pkg.github.com' - name: Use Nightly package.json in Ubuntu/macOS if: matrix.release == 'nightly' && matrix.os != 'windows-latest' - working-directory: ./examples/javascript run: | latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver) - npm install --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly + npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly - name: Use Nightly package.json in Windows if: matrix.release == 'nightly' && matrix.os == 'windows-latest' - working-directory: ./examples/javascript run: | $latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver - npm install --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly + npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly - name: Install Requirements working-directory: ./examples/javascript run: npm install From 294d17c9d3d312d59bda732d1df9ff3882b2f2a2 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 16:00:50 +0200 Subject: [PATCH 06/18] Adding auth to access GH packages --- .github/workflows/js-examples.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/js-examples.yml b/.github/workflows/js-examples.yml index f20a6f7f1558..89529649ca96 100644 --- a/.github/workflows/js-examples.yml +++ b/.github/workflows/js-examples.yml @@ -95,12 +95,16 @@ jobs: | latest_nightly=$(./scripts/latest-nightly-version.sh npm selenium-webdriver) npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Use Nightly package.json in Windows if: matrix.release == 'nightly' && matrix.os == 'windows-latest' run: | $latest_nightly = ./scripts/latest-nightly-version.ps1 npm selenium-webdriver npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install Requirements working-directory: ./examples/javascript run: npm install From 8e1c24f9beb0f77c6134b8613cfba6d585dc0cc4 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 16:06:40 +0200 Subject: [PATCH 07/18] More auth --- .github/workflows/js-examples.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/js-examples.yml b/.github/workflows/js-examples.yml index 89529649ca96..7efd4f7bf201 100644 --- a/.github/workflows/js-examples.yml +++ b/.github/workflows/js-examples.yml @@ -97,6 +97,7 @@ jobs: npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Use Nightly package.json in Windows if: matrix.release == 'nightly' && matrix.os == 'windows-latest' run: @@ -105,6 +106,7 @@ jobs: npm install --prefix ./examples/javascript --save selenium-webdriver@npm:@seleniumhq/selenium-webdriver@$latest_nightly env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install Requirements working-directory: ./examples/javascript run: npm install From bbfcb9c8690a26c19e1e60b3f558fd43c4d7415e Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 16:09:28 +0000 Subject: [PATCH 08/18] Removing nightly conditional --- examples/ruby/Gemfile | 12 ++---------- examples/ruby/Gemfile.lock | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/examples/ruby/Gemfile b/examples/ruby/Gemfile index f550ccafce6a..c5560378155d 100644 --- a/examples/ruby/Gemfile +++ b/examples/ruby/Gemfile @@ -7,13 +7,5 @@ gem 'rake', '~> 13.0' gem 'rspec', '~> 3.0' gem 'rubocop', '~> 1.35' gem 'rubocop-rspec', '~> 2.12' -gem 'selenium-devtools', '~> 0.122' - -if ENV['SE_NIGHTLY'] - source 'https://rubygems.pkg.github.com/seleniumhq' do - selenium = 'selenium-webdriver' - gem selenium, '~> 4.19.0.nightly' - end -else - gem 'selenium-webdriver', '= 4.19.0' -end +gem 'selenium-devtools', '= 0.123' +gem 'selenium-webdriver', '= 4.19.0' \ No newline at end of file diff --git a/examples/ruby/Gemfile.lock b/examples/ruby/Gemfile.lock index f7a2568e94b7..f0b43a9e3fce 100644 --- a/examples/ruby/Gemfile.lock +++ b/examples/ruby/Gemfile.lock @@ -77,7 +77,7 @@ DEPENDENCIES rspec (~> 3.0) rubocop (~> 1.35) rubocop-rspec (~> 2.12) - selenium-devtools (~> 0.122) + selenium-devtools (= 0.123) selenium-webdriver (= 4.19.0) BUNDLED WITH From 2af1101560d76c1b8cef66a372c603e1218f1336 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 20:35:22 +0000 Subject: [PATCH 09/18] Adapting ruby workflow for nightly --- .github/workflows/ruby-examples.yml | 30 ++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ruby-examples.yml b/.github/workflows/ruby-examples.yml index 42f46b657724..c6ec6716bf26 100644 --- a/.github/workflows/ruby-examples.yml +++ b/.github/workflows/ruby-examples.yml @@ -26,6 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] + release: [ stable, nightly ] runs-on: ${{ matrix.os }} steps: - name: Checkout GitHub repo @@ -48,7 +49,34 @@ jobs: with: ruby-version: 3.0 bundler-cache: true - - name: Install Gems + - name: Install Gems Nightly non-Windows + if: matrix.release == 'nightly' && matrix.os != 'windows-latest' + working-directory: ./examples/ruby + run: + | + latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver) + latest_nightly_devtools=$(./scripts/latest-nightly-version.sh rubygems selenium-devtools) + bundle install + bundle remove selenium-webdriver selenium-devtools + bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" + bundle add selenium-devtools --version $latest_nightly_devtools --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Install Gems Nightly Windows + if: matrix.release == 'nightly' && matrix.os == 'windows-latest' + working-directory: ./examples/ruby + run: + | + $latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver + $latest_nightly_devtools = ./scripts/latest-nightly-version.ps1 rubygems selenium-devtools + bundle install + bundle remove selenium-webdriver selenium-devtools + bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" + bundle add selenium-devtools --version $latest_nightly_devtools --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Install Gems Stable + if: matrix.release == 'stable' working-directory: ./examples/ruby run: bundle install - name: Set up Java From 2fbff557e1d447e5a96cbb982deefee25a433c30 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 20:38:19 +0000 Subject: [PATCH 10/18] Using root as work path --- .github/workflows/ruby-examples.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ruby-examples.yml b/.github/workflows/ruby-examples.yml index c6ec6716bf26..952f4f28fdf3 100644 --- a/.github/workflows/ruby-examples.yml +++ b/.github/workflows/ruby-examples.yml @@ -51,11 +51,11 @@ jobs: bundler-cache: true - name: Install Gems Nightly non-Windows if: matrix.release == 'nightly' && matrix.os != 'windows-latest' - working-directory: ./examples/ruby run: | latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver) latest_nightly_devtools=$(./scripts/latest-nightly-version.sh rubygems selenium-devtools) + cd examples/ruby bundle install bundle remove selenium-webdriver selenium-devtools bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" @@ -64,11 +64,11 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install Gems Nightly Windows if: matrix.release == 'nightly' && matrix.os == 'windows-latest' - working-directory: ./examples/ruby run: | $latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver $latest_nightly_devtools = ./scripts/latest-nightly-version.ps1 rubygems selenium-devtools + cd examples/ruby bundle install bundle remove selenium-webdriver selenium-devtools bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" From 8d6ebccdd38d454ff4cd9365e22f070810f412d1 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 20:42:14 +0000 Subject: [PATCH 11/18] Using secrets instead of env var --- .github/workflows/ruby-examples.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ruby-examples.yml b/.github/workflows/ruby-examples.yml index 952f4f28fdf3..1df273248a18 100644 --- a/.github/workflows/ruby-examples.yml +++ b/.github/workflows/ruby-examples.yml @@ -58,8 +58,8 @@ jobs: cd examples/ruby bundle install bundle remove selenium-webdriver selenium-devtools - bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" - bundle add selenium-devtools --version $latest_nightly_devtools --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" + bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq" + bundle add selenium-devtools --version $latest_nightly_devtools --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install Gems Nightly Windows @@ -71,8 +71,8 @@ jobs: cd examples/ruby bundle install bundle remove selenium-webdriver selenium-devtools - bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" - bundle add selenium-devtools --version $latest_nightly_devtools --source "https://token:${GITHUB_TOKEN}@rubygems.pkg.github.com/seleniumhq" + bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq" + bundle add selenium-devtools --version $latest_nightly_devtools --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install Gems Stable From d836aeaae6df6330214cd755eb469ca4bf44ac40 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 20:47:23 +0000 Subject: [PATCH 12/18] Using stable devtools --- .github/workflows/ruby-examples.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ruby-examples.yml b/.github/workflows/ruby-examples.yml index 1df273248a18..7c94710fb9bd 100644 --- a/.github/workflows/ruby-examples.yml +++ b/.github/workflows/ruby-examples.yml @@ -54,12 +54,10 @@ jobs: run: | latest_nightly_webdriver=$(./scripts/latest-nightly-version.sh rubygems selenium-webdriver) - latest_nightly_devtools=$(./scripts/latest-nightly-version.sh rubygems selenium-devtools) cd examples/ruby bundle install - bundle remove selenium-webdriver selenium-devtools + bundle remove selenium-webdriver bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq" - bundle add selenium-devtools --version $latest_nightly_devtools --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install Gems Nightly Windows @@ -67,12 +65,10 @@ jobs: run: | $latest_nightly_webdriver = ./scripts/latest-nightly-version.ps1 rubygems selenium-webdriver - $latest_nightly_devtools = ./scripts/latest-nightly-version.ps1 rubygems selenium-devtools cd examples/ruby bundle install - bundle remove selenium-webdriver selenium-devtools + bundle remove selenium-webdriver bundle add selenium-webdriver --version $latest_nightly_webdriver --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq" - bundle add selenium-devtools --version $latest_nightly_devtools --source "https://token:${{secrets.GITHUB_TOKEN}}@rubygems.pkg.github.com/seleniumhq" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install Gems Stable From 69b0dde6747d0edf057e9f8dd16909e98b490d4e Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 20:58:29 +0000 Subject: [PATCH 13/18] Nightly for Python --- .github/workflows/python-examples.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-examples.yml b/.github/workflows/python-examples.yml index 3a046317f920..a23a4d2e82d7 100644 --- a/.github/workflows/python-examples.yml +++ b/.github/workflows/python-examples.yml @@ -26,6 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] + release: [ stable, nightly ] runs-on: ${{ matrix.os }} steps: - name: Checkout GitHub repo @@ -47,7 +48,15 @@ jobs: uses: actions/setup-python@v5 with: python-version: 3.8 - - name: Install dependencies + - name: Install dependencies nightly + if: matrix.release == 'nightly' + working-directory: ./examples/python + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install -i https://test.pypi.org/simple/ --force-reinstall -v selenium + - name: Install dependencies stable + if: matrix.release == 'stable' working-directory: ./examples/python run: | python -m pip install --upgrade pip From fc1f1b5e664bc81d9247be65228d9a67d5bd56b6 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 22 Apr 2024 21:09:02 +0000 Subject: [PATCH 14/18] Index for dependencies --- .github/workflows/python-examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-examples.yml b/.github/workflows/python-examples.yml index a23a4d2e82d7..644c0c88dfcf 100644 --- a/.github/workflows/python-examples.yml +++ b/.github/workflows/python-examples.yml @@ -54,7 +54,7 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - pip install -i https://test.pypi.org/simple/ --force-reinstall -v selenium + pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple --force-reinstall -v selenium - name: Install dependencies stable if: matrix.release == 'stable' working-directory: ./examples/python From 158b3d43495d7f9f80801d82cd7885341d5bcd8b Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 23 Apr 2024 14:01:28 +0200 Subject: [PATCH 15/18] Nightly in Selenium Java --- .github/workflows/java-examples.yml | 12 +++++++++++- examples/java/pom.xml | 5 +++-- examples/javascript/package.nightly.json | 16 ---------------- 3 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 examples/javascript/package.nightly.json diff --git a/.github/workflows/java-examples.yml b/.github/workflows/java-examples.yml index e05dd43dfd64..188051a04bc1 100644 --- a/.github/workflows/java-examples.yml +++ b/.github/workflows/java-examples.yml @@ -48,7 +48,8 @@ jobs: with: distribution: 'temurin' java-version: 11 - - name: Run Tests + - name: Run Tests Nightly + if: matrix.release == 'stable' uses: nick-invision/retry@v3.0.0 with: timeout_minutes: 20 @@ -56,3 +57,12 @@ jobs: command: | cd examples/java mvn -B test + - name: Run Tests Nightly + if: matrix.release == 'nightly' + uses: nick-invision/retry@v3.0.0 + with: + timeout_minutes: 20 + max_attempts: 3 + command: | + cd examples/java + mvn -B -U test -Dselenium.version=4.20-SNAPSHOT diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 3b98ecd71872..f3a54bcb20e0 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -13,6 +13,7 @@ 11 11 UTF-8 + 4.19.1 @@ -29,12 +30,12 @@ org.seleniumhq.selenium selenium-java - 4.19.1 + ${selenium.version} org.seleniumhq.selenium selenium-grid - 4.19.1 + ${selenium.version} org.junit.jupiter diff --git a/examples/javascript/package.nightly.json b/examples/javascript/package.nightly.json deleted file mode 100644 index 6759827525c0..000000000000 --- a/examples/javascript/package.nightly.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "javascript-examples", - "version": "1.0.0", - "scripts": { - "test": "npx mocha test/**/*.spec.js --timeout 60000" - }, - "author": "The Selenium project", - "license": "Apache-2.0", - "dependencies": { - "assert": "2.1.0", - "selenium-webdriver": "npm:@seleniumhq/selenium-webdriver@4.20.0-nightly202404221125" - }, - "devDependencies": { - "mocha": "10.4.0" - } -} From faf1c24dc4188da5134ed43b1c5b3f2696cc7d00 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 23 Apr 2024 14:10:01 +0200 Subject: [PATCH 16/18] Missed matrix release --- .github/workflows/java-examples.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/java-examples.yml b/.github/workflows/java-examples.yml index 188051a04bc1..d9d2c7c2934c 100644 --- a/.github/workflows/java-examples.yml +++ b/.github/workflows/java-examples.yml @@ -26,6 +26,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] + release: [ stable, nightly ] runs-on: ${{ matrix.os }} steps: - name: Checkout GitHub repo From cce119e607c0b69d15ff3421c706ac9cb94a2783 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 23 Apr 2024 14:12:01 +0200 Subject: [PATCH 17/18] Naming properly --- .github/workflows/java-examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-examples.yml b/.github/workflows/java-examples.yml index d9d2c7c2934c..febc52a89198 100644 --- a/.github/workflows/java-examples.yml +++ b/.github/workflows/java-examples.yml @@ -49,7 +49,7 @@ jobs: with: distribution: 'temurin' java-version: 11 - - name: Run Tests Nightly + - name: Run Tests Stable if: matrix.release == 'stable' uses: nick-invision/retry@v3.0.0 with: From eceb3b672d95c0a5d31bea8fe07036b3eea610c5 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 23 Apr 2024 14:24:51 +0200 Subject: [PATCH 18/18] Fixing error in version --- .github/workflows/java-examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-examples.yml b/.github/workflows/java-examples.yml index febc52a89198..e591bd244e24 100644 --- a/.github/workflows/java-examples.yml +++ b/.github/workflows/java-examples.yml @@ -66,4 +66,4 @@ jobs: max_attempts: 3 command: | cd examples/java - mvn -B -U test -Dselenium.version=4.20-SNAPSHOT + mvn -B -U test -Dselenium.version=4.20.0-SNAPSHOT