ci: fix race condition for gnome keyring and run all rpc tests for release PRs

Author: mootz12

.github/workflows/rpc-tests.yml

@@ -24,33 +24,43 @@ jobs:
           # Apple Intel (this runner has better support to nested virtualization)
           - macos-15-large
         exclude:
-          # Only run Linux x64 tests on pull request to save some time
-          - sys:
-              ${{ github.event_name != 'push' && 'ubuntu-jammy-8-cores-arm64' }}
-          - sys: ${{ github.event_name != 'push' && 'macos-15-large' }}
+          # Only run Linux x64 on non-release PRs to save CI minutes
+          - sys: ${{ github.event_name != 'push' && !startsWith(github.ref_name, 'release/') && 'ubuntu-jammy-8-cores-arm64' }}
+          - sys: ${{ github.event_name != 'push' && !startsWith(github.ref_name, 'release/') && 'macos-15-large' }}
     runs-on: ${{ matrix.sys }}
     env:
-      TEST_THREADS: ${{ contains(matrix.sys, 'macos') && '--test-threads=1' || '' }} # macOS has limited resources, so we run tests (that rely on `testcontainers`) with 1 thread
+      TEST_THREADS: ${{ contains(matrix.sys, 'macos') && '2' || '4' }} # macOS has limited resources
     steps:
       - uses: stellar/quickstart@main
         with:
           tag: future
+          enable: core,rpc
       - uses: actions/checkout@v5
       - uses: stellar/actions/rust-cache@main
       - run: rustup update
       - run:
           sudo apt update && sudo apt install -y libudev-dev libdbus-1-dev
           gnome-keyring
         if: runner.os == 'Linux'
-      - name: Start gnome-keyring
+      - name: Start gnome-keyring and wait for it to be ready
         if: runner.os == 'Linux'
         # run gnome-keyring with 'foobar' as password for the login keyring
         # this will create a new login keyring and unlock it
         # the login password doesn't matter, but the keyring must be unlocked for the tests to work
-        # this is based on the ci workflow in the keyring crate repo
-        run:
-          gnome-keyring-daemon --components=secrets --daemonize --unlock <<<
-          'foobar'
+        run: |
+          gnome-keyring-daemon --components=secrets --daemonize --unlock <<< 'foobar'
+
+          echo "Waiting for Keyring to become ready..."
+          for i in {1..20}; do
+            if secret-tool store --label='gh-action-secret' gh-action-domain gh-action.org <<< 'gh-action-val' 2>/dev/null; then
+              echo "Keyring ready and operational."
+              exit 0
+            fi
+            sleep 1
+          done
+          
+          echo "Error: GNOME Keyring failed to start or become ready within the timeout."
+          exit 1
       - name: Check GNOME Keyring
         if: runner.os == 'Linux'
         run: |
@@ -60,4 +70,4 @@ jobs:
       - run: make build-test-wasms
       - run:
           RUST_BACKTRACE=1 cargo test --features it --package soroban-test --test it --
-          integration $TEST_THREADS
+          integration --test-threads=$TEST_THREADS

Makefile

@@ -54,7 +54,7 @@ test: build-test
 
 # expects a quickstart container running with the rpc exposed at localhost:SOROBAN_PORT
 rpc-test:
-	cargo test --features it --test it -- integration 
+	cargo test --features it --test it -- integration --test-threads=4
 
 check:
 	cargo clippy --all-targets