Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build-docs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/release-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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
Expand All @@ -96,12 +96,12 @@ jobs:
name: 'Contract Tests (Android)'

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: Setup .NET 9 SDK
uses: actions/setup-dotnet@v4
- 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
Expand All @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
<OutputType>Exe</OutputType>
<RootNamespace>ContractTestService.Android</RootNamespace>
Expand Down
6 changes: 3 additions & 3 deletions scripts/start-android-test-service.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading