This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 25886f34da HDDS-10028. Simplify Maven cache for dependencies in CI
(#5889)
25886f34da is described below
commit 25886f34daca88515347fb9918d4f98c449794c8
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Jan 2 08:38:27 2024 +0100
HDDS-10028. Simplify Maven cache for dependencies in CI (#5889)
---
.github/workflows/ci.yml | 101 ++++++++++++++++++-----------------------------
1 file changed, 38 insertions(+), 63 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28dd907c07..331da2385e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
