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
15 changes: 5 additions & 10 deletions .github/workflows/android_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.x'

- name: Set up JDK
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -48,7 +43,7 @@ jobs:
# Accept licenses and install required components
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
# Install Android API level 35 and necessary system images
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-36" "system-images;android-36;google_apis;x86_64"

# Export paths for future steps
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
Expand All @@ -59,11 +54,11 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.android/avd
key: android-emulator-x86-${{ runner.os }}-android-35
key: android-emulator-x86-${{ runner.os }}-android-36

- name: Create Android Emulator (x86)
run: |
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-36;google_apis;x86_64" --device "pixel_4"

- name: List AVDs
run: avdmanager list avd
Expand Down Expand Up @@ -124,7 +119,7 @@ jobs:
- name: Install Android Build Tools
run: |
echo "Installing Android Build Tools..."
sdkmanager "build-tools;35.0.0" # Updated to use Android 34 build tools
sdkmanager "build-tools;36.0.0" # Updated to use Android 34 build tools
sdkmanager --update

- name: Install MAUI workloads
Expand Down Expand Up @@ -157,7 +152,7 @@ jobs:
run: dotnet restore TransactionProcessor.Mobile.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json

- name: Build Code
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net9.0-android -c Release --no-restore
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net10.0-android -c Release --no-restore

- name: Run Android Navigation Tests
run: dotnet test TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj --filter "(Category=PRTest)&(Category=Android)" --no-restore
Expand Down
30 changes: 10 additions & 20 deletions .github/workflows/android_navigation_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.x'

- name: Set up JDK
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -48,7 +43,7 @@ jobs:
# Accept licenses and install required components
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
# Install Android API level 35 and necessary system images
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-36" "system-images;android-36;google_apis;x86_64"

# Export paths for future steps
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
Expand All @@ -59,11 +54,11 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.android/avd
key: android-emulator-x86-${{ runner.os }}-android-35
key: android-emulator-x86-${{ runner.os }}-android-36

- name: Create Android Emulator (x86)
run: |
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-36;google_apis;x86_64" --device "pixel_4"

- name: List AVDs
run: avdmanager list avd
Expand Down Expand Up @@ -124,7 +119,7 @@ jobs:
- name: Install Android Build Tools
run: |
echo "Installing Android Build Tools..."
sdkmanager "build-tools;35.0.0" # Updated to use Android 35 build tools
sdkmanager "build-tools;36.0.0" # Updated to use Android 35 build tools
sdkmanager --update

- name: Install MAUI workloads
Expand All @@ -144,7 +139,7 @@ jobs:
run: dotnet restore TransactionProcessor.Mobile.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json

- name: Build Code
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net9.0-android -c Release --no-restore
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net10.0-android -c Release --no-restore

- name: Run Android Navigation Tests
run: dotnet test TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj --filter "(Category=PRNavTest)&(Category=Android)" --no-restore
Expand All @@ -162,11 +157,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: '9.0.x'

- name: Set up JDK
uses: actions/setup-java@v3
with:
Expand Down Expand Up @@ -198,7 +188,7 @@ jobs:
# Accept licenses and install required components
yes | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
# Install Android API level 35 and necessary system images
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-35" "system-images;android-35;google_apis;x86_64"
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager "platform-tools" "emulator" "platforms;android-36" "system-images;android-36;google_apis;x86_64"

# Export paths for future steps
echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >> $GITHUB_ENV
Expand All @@ -209,11 +199,11 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.android/avd
key: android-emulator-x86-${{ runner.os }}-android-35
key: android-emulator-x86-${{ runner.os }}-android-36

- name: Create Android Emulator (x86)
run: |
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-35;google_apis;x86_64" --device "pixel_4"
echo "no" | avdmanager create avd -n test_emulator -k "system-images;android-36;google_apis;x86_64" --device "pixel_4"

- name: List AVDs
run: avdmanager list avd
Expand Down Expand Up @@ -274,7 +264,7 @@ jobs:
- name: Install Android Build Tools
run: |
echo "Installing Android Build Tools..."
sdkmanager "build-tools;35.0.0" # Updated to use Android 35 build tools
sdkmanager "build-tools;36.0.0" # Updated to use Android 35 build tools
sdkmanager --update

- name: Install MAUI workloads
Expand All @@ -294,7 +284,7 @@ jobs:
run: dotnet restore TransactionProcessor.Mobile.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }} --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json

- name: Build Code
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net9.0-android -c Release --no-restore
run: dotnet build TransactionProcessor.Mobile/TransactionProcessor.Mobile.csproj -f net10.0-android -c Release --no-restore

- name: Run Android Navigation Tests
run: dotnet test TransactionProcessor.Mobile.UITests/TransactionProcessor.Mobile.UITests.csproj --filter "(Category=PRHWNavTest)&(Category=Android)" --no-restore
Expand Down
207 changes: 0 additions & 207 deletions .github/workflows/ios_e2e_tests - selfhosted.yml

This file was deleted.

Loading
Loading