Skip to content
Open
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
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
echo Using BoringSSL commit: $(cd "${{ runner.temp }}/boringssl"; git rev-parse HEAD)

- name: Archive BoringSSL source
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: boringssl-source
path: ${{ runner.temp }}/boringssl
Expand All @@ -34,7 +34,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:

steps:
- name: Set up JDK 11 for toolchains
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: 11
Expand All @@ -81,7 +81,7 @@ jobs:
echo "SDKMANAGER=${{ runner.temp }}/android-sdk/cmdline-tools/bin/sdkmanager" >> $GITHUB_ENV
echo "M2_REPO=${{ runner.temp }}/m2" >> $GITHUB_ENV

- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup Linux environment
if: runner.os == 'Linux'
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
choco install ninja -y

- name: Fetch BoringSSL source
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: boringssl-source
path: ${{ runner.temp }}/boringssl
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
run: ./gradlew publishToMavenLocal -Dmaven.repo.local="$M2_REPO"

- name: Upload Maven respository
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: m2repo-${{ runner.os }}
path: ${{ runner.temp }}/m2
Expand All @@ -208,7 +208,7 @@ jobs:

- name: Upload test JAR with dependencies
if: runner.os == 'Linux'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: testjar
path: openjdk/build/libs/conscrypt-openjdk-*-tests.jar
Expand All @@ -220,7 +220,7 @@ jobs:
runs-on: ubuntu-latest

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

- name: Setup Linux environment
run: |
Expand All @@ -243,7 +243,7 @@ jobs:
echo "BORINGSSL_HOME=${{ runner.temp }}/boringssl" >> $GITHUB_ENV

- name: Fetch BoringSSL source
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: boringssl-source
path: ${{ runner.temp }}/boringssl
Expand Down Expand Up @@ -274,19 +274,19 @@ jobs:
# mkdir -p "${{ runner.temp }}/boringssl/include"

- name: Download Maven repository for Linux
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: m2repo-Linux
path: ${{ runner.temp }}/m2

- name: Download Maven repository for MacOS
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: m2repo-macOS
path: ${{ runner.temp }}/m2

- name: Download Maven repository for Windows
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: m2repo-Windows
path: ${{ runner.temp }}/m2
Expand All @@ -302,7 +302,7 @@ jobs:
./gradlew :conscrypt-openjdk-uber:publishToMavenLocal -Dorg.conscrypt.openjdk.buildUberJar=true -Dmaven.repo.local="$M2_REPO"

- name: Upload Maven respository
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: m2repo-uber
path: ${{ runner.temp }}/m2
Expand Down Expand Up @@ -338,19 +338,19 @@ jobs:

steps:
- name: Set up Java
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: ${{ matrix.dist }}
java-version: ${{ matrix.java }}

- name: Download UberJAR
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: m2repo-uber
path: m2

- name: Download Test JAR with Dependencies
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: testjar
path: testjar
Expand Down Expand Up @@ -392,7 +392,7 @@ jobs:

- name: Archive test results
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: test-results-${{ matrix.platform }}-${{ matrix.java }}-${{ matrix.dist }}
path: results