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 48bc30f514 HDDS-10470. Populate Maven dependency cache in separate
workflow (#6340)
48bc30f514 is described below
commit 48bc30f51426e059899b8fb0e1e77409f29a519f
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Mar 8 08:52:03 2024 +0100
HDDS-10470. Populate Maven dependency cache in separate workflow (#6340)
---
.github/workflows/ci.yml | 16 +++---
.github/workflows/intermittent-test-check.yml | 6 +--
.github/workflows/populate-cache.yml | 74 +++++++++++++++++++++++++++
.github/workflows/repeat-acceptance.yml | 12 ++---
4 files changed, 89 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74c4756cfd..b1df2254c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -92,10 +92,10 @@ jobs:
restore-keys: |
${{ runner.os }}-pnpm-
- name: Cache for maven dependencies
- uses: actions/cache@v4
+ uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
@@ -164,7 +164,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
@@ -202,7 +202,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
@@ -246,7 +246,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
@@ -314,7 +314,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
@@ -449,7 +449,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
@@ -509,7 +509,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
diff --git a/.github/workflows/intermittent-test-check.yml
b/.github/workflows/intermittent-test-check.yml
index 3239215aa9..dda123305b 100644
--- a/.github/workflows/intermittent-test-check.yml
+++ b/.github/workflows/intermittent-test-check.yml
@@ -75,10 +75,10 @@ jobs:
- name: Checkout project
uses: actions/checkout@v4
- name: Cache for maven dependencies
- uses: actions/cache@v4
+ uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
@@ -115,7 +115,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: |
- ~/.m2/repository
+ ~/.m2/repository/*/*/*
!~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}
restore-keys: |
diff --git a/.github/workflows/populate-cache.yml
b/.github/workflows/populate-cache.yml
new file mode 100644
index 0000000000..47d4d30f6f
--- /dev/null
+++ b/.github/workflows/populate-cache.yml
@@ -0,0 +1,74 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This workflow creates cache with Maven dependencies for Ozone build.
+
+name: populate-cache
+
+on:
+ push:
+ branches:
+ - master
+ - ozone-1.4
+ paths:
+ - 'pom.xml'
+ - '**/pom.xml'
+ - '.github/workflows/populate-cache.yml'
+ schedule:
+ - cron: '20 3 * * *'
+
+jobs:
+ build:
+ runs-on: ubuntu-20.04
+ steps:
+ - name: Checkout project
+ uses: actions/checkout@v4
+
+ - name: Restore cache for Maven dependencies
+ id: restore-cache
+ uses: actions/cache/restore@v4
+ with:
+ path: |
+ ~/.m2/repository/*/*/*
+ !~/.m2/repository/org/apache/ozone
+ key: maven-repo-${{ hashFiles('**/pom.xml') }}
+
+ - name: Setup Java
+ if: steps.restore-cache.outputs.cache-hit != 'true'
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: 8
+
+ - name: Fetch dependencies
+ if: steps.restore-cache.outputs.cache-hit != 'true'
+ run: mvn --batch-mode --fail-never --no-transfer-progress
--show-version dependency:go-offline
+
+ - name: Delete Ozone jars from repo
+ if: steps.restore-cache.outputs.cache-hit != 'true'
+ run: rm -fr ~/.m2/repository/org/apache/ozone
+
+ - name: List repo contents
+ if: steps.restore-cache.outputs.cache-hit != 'true'
+ run: find ~/.m2/repository -type f | sort | xargs ls -lh
+
+ - name: Save cache for Maven dependencies
+ if: steps.restore-cache.outputs.cache-hit != 'true'
+ uses: actions/cache/save@v4
+ with:
+ path: |
+ ~/.m2/repository/*/*/*
+ !~/.m2/repository/org/apache/ozone
+ key: maven-repo-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/repeat-acceptance.yml
b/.github/workflows/repeat-acceptance.yml
index 7269a9c417..6eb9c26f07 100644
--- a/.github/workflows/repeat-acceptance.yml
+++ b/.github/workflows/repeat-acceptance.yml
@@ -91,9 +91,11 @@ jobs:
restore-keys: |
${{ runner.os }}-pnpm-
- name: Cache for maven dependencies
- uses: actions/cache@v4
+ uses: actions/cache/restore@v4
with:
- path: ~/.m2/repository
+ path: |
+ ~/.m2/repository/*/*/*
+ !~/.m2/repository/org/apache/ozone
key: maven-repo-${{ hashFiles('**/pom.xml') }}-${{ env.JAVA_VERSION
}}
restore-keys: |
maven-repo-${{ hashFiles('**/pom.xml') }}
@@ -115,12 +117,6 @@ jobs:
hadoop-ozone/dist/target/ozone-*.tar.gz
!hadoop-ozone/dist/target/ozone-*-src.tar.gz
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()
acceptance:
needs:
- prepare-job
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
