From baea0fbcfa4ca6e9ba5eb861dc5457dc55074627 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Tue, 17 Nov 2026 18:57:46 +0000 Subject: [PATCH 1/2] chore: Bump GitHub Actions to their Node.js 24 versions Generated-by: termag --- .github/actions/build-docs/action.yml | 2 +- .github/actions/publish/action.yml | 2 +- .github/actions/release-build/action.yml | 2 +- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/publish.yml | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/actions/build-docs/action.yml b/.github/actions/build-docs/action.yml index f94fd61..44ed9d7 100644 --- a/.github/actions/build-docs/action.yml +++ b/.github/actions/build-docs/action.yml @@ -5,7 +5,7 @@ runs: using: composite steps: - name: Setup dotnet build tools - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v6 with: dotnet-version: 9.0 - name: Install docfx diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index c0b7048..252094a 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -8,7 +8,7 @@ runs: using: composite steps: - name: Setup dotnet build tools - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v6 with: dotnet-version: 9.0 diff --git a/.github/actions/release-build/action.yml b/.github/actions/release-build/action.yml index 45a5be1..e9ca00e 100644 --- a/.github/actions/release-build/action.yml +++ b/.github/actions/release-build/action.yml @@ -5,7 +5,7 @@ runs: using: composite steps: - name: Setup dotnet build tools - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v6 with: dotnet-version: 9.0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca5ad57..b69882f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,10 +24,10 @@ jobs: id-token: write # Needed if using OIDC to get release secrets. steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Setup dotnet build tools - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v6 with: dotnet-version: 8.0 @@ -47,10 +47,10 @@ jobs: TEST_SERVICE_PORT: 8000 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Setup dotnet build tools - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v6 with: dotnet-version: 8.0 @@ -75,7 +75,7 @@ jobs: - name: Upload test service logs if: failure() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: contract-test-service-logs path: /tmp/sse-contract-test-service.log @@ -96,10 +96,10 @@ jobs: name: 'Contract Tests (Android)' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Setup .NET 9 SDK - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v6 with: dotnet-version: 9.0 @@ -124,7 +124,7 @@ jobs: # Action version is SHA-pinned for supply-chain safety. - name: Run harness against Android emulator - uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # 2.30.1 + uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # v2.38.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -147,7 +147,7 @@ jobs: make start-contract-test-service-android make run-contract-tests-android - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 if: failure() with: name: android-contract-test-logs diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ecdac9f..55c8ce9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,9 +25,9 @@ jobs: attestations: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - - uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1.2.0 + - uses: launchdarkly/gh-actions/actions/release-secrets@release-secrets-v1.2.1 name: Get secrets with: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} From 1500a0b11c4babc27a528fd9e8c1e1a74dcce3a7 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Wed, 18 Nov 2026 18:06:26 +0000 Subject: [PATCH 2/2] chore: Build the Android contract tests for net10.0-android Generated-by: termag --- .github/workflows/ci.yml | 4 ++-- Makefile | 2 +- contract-tests-android/ContractTestService.Android.csproj | 2 +- scripts/start-android-test-service.sh | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b69882f..7a2d077 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,10 +98,10 @@ jobs: steps: - uses: actions/checkout@v7 - - name: Setup .NET 9 SDK + - name: Setup .NET 10 SDK uses: actions/setup-dotnet@v6 with: - dotnet-version: 9.0 + dotnet-version: 10.0 - name: Install .NET Android workload run: dotnet workload install android diff --git a/Makefile b/Makefile index 9af7919..4aa9e9b 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ run-contract-tests: contract-tests: build-contract-tests start-contract-test-service-bg run-contract-tests # ---- Android contract tests ---- -# Requires: an Android emulator or device connected via adb, and the .NET 9 SDK with the +# Requires: an Android emulator or device connected via adb, and the .NET 10 SDK with the # android workload installed. See ci.yml's contract-tests-android job for how CI does this. build-contract-tests-android: diff --git a/contract-tests-android/ContractTestService.Android.csproj b/contract-tests-android/ContractTestService.Android.csproj index 5d1b74b..294e1af 100644 --- a/contract-tests-android/ContractTestService.Android.csproj +++ b/contract-tests-android/ContractTestService.Android.csproj @@ -1,7 +1,7 @@ - net9.0-android + net10.0-android 21 Exe ContractTestService.Android diff --git a/scripts/start-android-test-service.sh b/scripts/start-android-test-service.sh index ab41cbe..fdfa183 100755 --- a/scripts/start-android-test-service.sh +++ b/scripts/start-android-test-service.sh @@ -18,14 +18,14 @@ LOCAL_PORT=${LOCAL_PORT:-8000} ANDROID_PORT=${ANDROID_PORT:-5554} SERIAL_NUMBER=emulator-${ANDROID_PORT} APP_ID=${APP_ID:-com.launchdarkly.contracttestservice} -APK_PATH=${APK_PATH:-contract-tests-android/bin/Debug/net9.0-android/${APP_ID}-Signed.apk} +APK_PATH=${APK_PATH:-contract-tests-android/bin/Debug/net10.0-android/${APP_ID}-Signed.apk} if [ ! -f "$APK_PATH" ]; then # Fall back to the unsigned APK if the signed one isn't present -- .NET for Android emits # -Signed.apk under some configurations and a bare .apk under others. - APK_PATH=$(find contract-tests-android/bin/Debug/net9.0-android -name '*.apk' -not -name '*Signed*' | head -1) + APK_PATH=$(find contract-tests-android/bin/Debug/net10.0-android -name '*.apk' -not -name '*Signed*' | head -1) if [ -z "$APK_PATH" ] || [ ! -f "$APK_PATH" ]; then - echo "No APK found under contract-tests-android/bin/Debug/net9.0-android/" >&2 + echo "No APK found under contract-tests-android/bin/Debug/net10.0-android/" >&2 exit 1 fi fi