Skip to content

HDDS-10028. Simplify Maven cache for dependencies in CI #5889

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

Merged
adoroszlai merged 3 commits into from
Jan 2, 2024
Merged

HDDS-10028. Simplify Maven cache for dependencies in CI #5889

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0369d7a
HDDS-10028. Use Maven cache for dependencies in license check
adoroszlai Dec 29, 2023
a33ccf2
use cache/restore in all checks except build
adoroszlai Dec 29, 2023
24b7001
restrict Maven cache path to avoid the need for explicit delete
adoroszlai Dec 29, 2023
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
101 changes: 38 additions & 63 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,11 @@ jobs:
- name: Cache for maven dependencies
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: maven-repo-${{ hashFiles('**/pom.xml') }}-${{ matrix.java }}
path: |
~/.m2/repository
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-repo-${{ hashFiles('**/pom.xml') }}
maven-repo-
- name: Setup java
uses: actions/setup-java@v3
Expand Down Expand Up @@ -129,12 +130,6 @@ jobs:
path: |
~/.m2/repository/org/apache/ozone
retention-days: 1
- name: Delete temporary build artifacts before caching
run: |
#Never cache local artifacts
rm -rf ~/.m2/repository/org/apache/ozone/hdds*
rm -rf ~/.m2/repository/org/apache/ozone/ozone*
if: always()
compile:
needs:
- build-info
Expand Down Expand Up @@ -162,12 +157,13 @@ jobs:
git config user.email '[email protected]'
git commit --allow-empty -a -m 'workaround for HADOOP-19011'
- name: Cache for maven dependencies
uses: actions/cache@v3
uses: actions/cache/restore@v3
with:
path: ~/.m2/repository
key: maven-repo-${{ hashFiles('**/pom.xml') }}-${{ matrix.java }}
path: |
~/.m2/repository
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-repo-${{ hashFiles('**/pom.xml') }}
maven-repo-
- name: Setup java
uses: actions/setup-java@v3
Expand All @@ -179,12 +175,6 @@ jobs:
env:
OZONE_WITH_COVERAGE: false
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
- name: Delete temporary build artifacts before caching
run: |
#Never cache local artifacts
rm -rf ~/.m2/repository/org/apache/ozone/hdds*
rm -rf ~/.m2/repository/org/apache/ozone/ozone*
if: always()
basic:
needs:
- build-info
Expand All @@ -205,13 +195,13 @@ jobs:
fetch-depth: 0
if: matrix.check == 'bats'
- name: Cache for maven dependencies
uses: actions/cache@v3
uses: actions/cache/restore@v3
with:
path: ~/.m2/repository
key: maven-repo-${{ hashFiles('**/pom.xml') }}-8-${{ matrix.check }}
path: |
~/.m2/repository
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-repo-${{ hashFiles('**/pom.xml') }}-8
maven-repo-${{ hashFiles('**/pom.xml') }}
maven-repo-
if: ${{ !contains('author,bats,docs', matrix.check) }}
- name: Setup java
Expand All @@ -234,12 +224,6 @@ jobs:
name: ${{ matrix.check }}
path: target/${{ matrix.check }}
continue-on-error: true
- name: Delete temporary build artifacts before caching
run: |
#Never cache local artifacts
rm -rf ~/.m2/repository/org/apache/ozone/hdds*
rm -rf ~/.m2/repository/org/apache/ozone/ozone*
if: always()
unit:
needs:
- build-info
Expand All @@ -255,13 +239,13 @@ jobs:
- name: Checkout project
uses: actions/checkout@v3
- name: Cache for maven dependencies
uses: actions/cache@v3
uses: actions/cache/restore@v3
with:
path: ~/.m2/repository
key: maven-repo-${{ hashFiles('**/pom.xml') }}-8-${{ matrix.profile }}
path: |
~/.m2/repository
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-repo-${{ hashFiles('**/pom.xml') }}-8
maven-repo-${{ hashFiles('**/pom.xml') }}
maven-repo-
- name: Setup java
uses: actions/setup-java@v3
Expand All @@ -283,12 +267,6 @@ jobs:
name: ${{ matrix.check }}
path: target/${{ matrix.check }}
continue-on-error: true
- name: Delete temporary build artifacts before caching
run: |
#Never cache local artifacts
rm -rf ~/.m2/repository/org/apache/ozone/hdds*
rm -rf ~/.m2/repository/org/apache/ozone/ozone*
if: always()
dependency:
needs:
- build-info
Expand Down Expand Up @@ -328,6 +306,15 @@ jobs:
steps:
- name: Checkout project
uses: actions/checkout@v3
- name: Cache for maven dependencies
uses: actions/cache/restore@v3
with:
path: |
~/.m2/repository
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-repo-
- name: Download Ozone repo
id: download-ozone-repo
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -456,13 +443,13 @@ jobs:
- name: Checkout project
uses: actions/checkout@v3
- name: Cache for maven dependencies
uses: actions/cache@v3
uses: actions/cache/restore@v3
with:
path: ~/.m2/repository
key: maven-repo-${{ hashFiles('**/pom.xml') }}-8-${{ matrix.profile }}
path: |
~/.m2/repository
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-repo-${{ hashFiles('**/pom.xml') }}-8
maven-repo-${{ hashFiles('**/pom.xml') }}
maven-repo-
- name: Download Ozone repo
id: download-ozone-repo
Expand Down Expand Up @@ -502,12 +489,6 @@ jobs:
name: it-${{ matrix.profile }}
path: target/integration
continue-on-error: true
- name: Delete temporary build artifacts before caching
run: |
#Never cache local artifacts
rm -rf ~/.m2/repository/org/apache/ozone/hdds*
rm -rf ~/.m2/repository/org/apache/ozone/ozone*
if: always()
coverage:
runs-on: ubuntu-20.04
timeout-minutes: 30
Expand All @@ -522,13 +503,13 @@ jobs:
with:
fetch-depth: 0
- name: Cache for maven dependencies
uses: actions/cache@v3
uses: actions/cache/restore@v3
with:
path: ~/.m2/repository
key: maven-repo-${{ hashFiles('**/pom.xml') }}-8-${{ github.job }}
path: |
~/.m2/repository
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
maven-repo-${{ hashFiles('**/pom.xml') }}-8
maven-repo-${{ hashFiles('**/pom.xml') }}
maven-repo-
- name: Download artifacts
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -557,9 +538,3 @@ jobs:
name: coverage
path: target/coverage
continue-on-error: true
- name: Delete temporary build artifacts before caching
run: |
#Never cache local artifacts
rm -rf ~/.m2/repository/org/apache/ozone/hdds*
rm -rf ~/.m2/repository/org/apache/ozone/ozone*
if: always()