Skip to content
Merged
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
19 changes: 10 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,23 @@ jobs:
fail-fast: false
matrix:
platform: [ubuntu-22.04, macos-latest, windows-latest]
# We use commandlinetools v20.
include:
- platform: ubuntu-22.04
tools_url: https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
tools_url: https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip
- platform: macos-latest
tools_url: https://dl.google.com/android/repository/commandlinetools-mac-9477386_latest.zip
tools_url: https://dl.google.com/android/repository/commandlinetools-mac-14742923_latest.zip
- platform: windows-latest
tools_url: https://dl.google.com/android/repository/commandlinetools-win-9477386_latest.zip
tools_url: https://dl.google.com/android/repository/commandlinetools-win-14742923_latest.zip

runs-on: ${{ matrix.platform }}

steps:
- name: Set up JDK 11 for toolchains
- name: Set up JDK 17 for toolchains
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: 11
java-version: 17

- name: Set runner-specific environment variables
shell: bash
Expand All @@ -95,7 +96,7 @@ jobs:
sudo apt-get -qq install -y --no-install-recommends \
g++-aarch64-linux-gnu \
ninja-build \
openjdk-11-jre-headless
openjdk-17-jre-headless

- name: Setup macOS environment
if: runner.os == 'macOS'
Expand Down Expand Up @@ -204,7 +205,7 @@ jobs:

- name: Test with Gradle
shell: bash
timeout-minutes: 15
timeout-minutes: 30
run: ./gradlew check -PcheckErrorQueue

- name: Publish to local Maven repo
Expand Down Expand Up @@ -249,7 +250,7 @@ jobs:
sudo apt-get -qq install -y --no-install-recommends \
g++-aarch64-linux-gnu \
ninja-build \
openjdk-11-jre-headless
openjdk-17-jre-headless

- name: Set runner-specific environment variables
shell: bash
Expand Down Expand Up @@ -402,7 +403,7 @@ jobs:
run: mvn org.apache.maven.plugins:maven-dependency-plugin:3.8.0:copy -Dartifact=org.junit.platform:junit-platform-console-standalone:1.11.2 -DoutputDirectory=. -Dmdep.stripVersion=true

- name: Run JUnit tests
timeout-minutes: 15
timeout-minutes: 30
shell: bash
run: |
DIR="$(find m2/org/conscrypt/conscrypt-openjdk-uber -maxdepth 1 -mindepth 1 -type d -print)"
Expand Down
Loading