Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ci.yml #1229

Merged
merged 5 commits into from
Sep 11, 2024
Merged

Update ci.yml #1229

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a8763e
Update ci.yml
prbprbprb Sep 11, 2024
c6be45d
Use @v4 for uploads and downloads.
prbprbprb Sep 11, 2024
f201750
Add retention.
prbprbprb Sep 11, 2024
68fe6f1
Untabify.
prbprbprb Sep 11, 2024
0dccc5d
Include hidden files <facepalm>
prbprbprb Sep 11, 2024
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
27 changes: 15 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@ jobs:
echo Using BoringSSL commit: $(cd "${{ runner.temp }}/boringssl"; git rev-parse HEAD)

- name: Archive BoringSSL source
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: boringssl-source
path: ${{ runner.temp }}/boringssl
retention-days: 1
include-hidden-files: true
if-no-files-found: error

build:
needs: boringssl_clone
Expand Down Expand Up @@ -91,7 +94,7 @@ jobs:
choco install ninja -y

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

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

- name: Upload test JAR with dependencies
if: runner.os == 'Linux'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: testjar
path: openjdk/build/libs/conscrypt-openjdk-*-tests.jar
Expand All @@ -208,7 +211,7 @@ jobs:
echo "BORINGSSL_HOME=${{ runner.temp }}/boringssl" >> $GITHUB_ENV

- name: Fetch BoringSSL source
uses: actions/download-artifact@v4.1.8
uses: actions/download-artifact@v4
with:
name: boringssl-source
path: ${{ runner.temp }}/boringssl
Expand All @@ -224,19 +227,19 @@ jobs:
mkdir -p "${{ runner.temp }}/boringssl/include"

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

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

- name: Download Maven repository for Windows
uses: actions/download-artifact@v4.1.8
uses: actions/download-artifact@v4
with:
name: m2repo-Windows
path: ${{ runner.temp }}/m2
Expand All @@ -252,7 +255,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@v1
uses: actions/upload-artifact@v4
with:
name: m2repo-uber
path: ${{ runner.temp }}/m2
Expand Down Expand Up @@ -282,13 +285,13 @@ jobs:
java-version: ${{ matrix.java }}

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

- name: Download Test JAR with Dependencies
uses: actions/download-artifact@v4.1.8
uses: actions/download-artifact@v4
with:
name: testjar
path: testjar
Expand All @@ -307,7 +310,7 @@ jobs:

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