Skip to content

[SPARK-57277][INFRA] Prefix all CI cache keys with runner.os #56342

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

Open
zhengruifeng wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −45
Open

[SPARK-57277][INFRA] Prefix all CI cache keys with runner.os #56342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 23 additions & 23 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Restore Coursier local repository
uses: actions/cache/restore@v5
with:
Expand Down Expand Up @@ -612,9 +612,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Cache Coursier local repository
uses: actions/cache@v5
with:
Expand Down Expand Up @@ -741,9 +741,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Restore Coursier local repository
uses: actions/cache/restore@v5
with:
Expand Down Expand Up @@ -927,9 +927,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Restore Coursier local repository
uses: actions/cache/restore@v5
with:
Expand Down Expand Up @@ -1078,9 +1078,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Restore Coursier local repository
uses: actions/cache/restore@v5
with:
Expand All @@ -1092,9 +1092,9 @@ jobs:
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: docs-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-docs-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
docs-maven-
${{ runner.os }}-docs-maven-
- name: Free up disk space
run: ./dev/free_disk_space_container
- name: Install Java ${{ inputs.java }}
Expand Down Expand Up @@ -1277,9 +1277,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Restore Coursier local repository
uses: actions/cache/restore@v5
with:
Expand All @@ -1291,9 +1291,9 @@ jobs:
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: docs-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-docs-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
docs-maven-
${{ runner.os }}-docs-maven-
- name: Free up disk space
run: ./dev/free_disk_space_container
- name: Install Java ${{ inputs.java }}
Expand Down Expand Up @@ -1472,9 +1472,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Restore Coursier local repository
uses: actions/cache/restore@v5
with:
Expand Down Expand Up @@ -1506,7 +1506,7 @@ jobs:
uses: actions/cache@v5
with:
path: ./tpcds-sf-1
key: tpcds-${{ hashFiles('.github/workflows/build_and_test.yml', 'sql/core/src/test/scala/org/apache/spark/sql/TPCDSSchema.scala') }}
key: ${{ runner.os }}-tpcds-${{ hashFiles('.github/workflows/build_and_test.yml', 'sql/core/src/test/scala/org/apache/spark/sql/TPCDSSchema.scala') }}
- name: Checkout tpcds-kit repository
if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true'
uses: actions/checkout@v6
Expand Down Expand Up @@ -1604,9 +1604,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Restore Coursier local repository
uses: actions/cache/restore@v5
with:
Expand Down Expand Up @@ -1690,9 +1690,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Restore Coursier local repository
uses: actions/cache/restore@v5
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_python_connect.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-spark-connect-python-only-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-spark-connect-python-only-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-spark-connect-python-only-
${{ runner.os }}-build-spark-connect-python-only-
- name: Cache Coursier local repository
uses: actions/cache@v5
with:
path: ~/.cache/coursier
key: coursier-build-spark-connect-python-only-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-coursier-build-spark-connect-python-only-${{ hashFiles('**/pom.xml') }}
restore-keys: |
coursier-build-spark-connect-python-only-
${{ runner.os }}-coursier-build-spark-connect-python-only-
- name: Install Java 17
uses: actions/setup-java@v5
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_python_connect40.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-spark-connect-python-only-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-spark-connect-python-only-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-spark-connect-python-only-
${{ runner.os }}-build-spark-connect-python-only-
- name: Cache Coursier local repository
uses: actions/cache@v5
with:
path: ~/.cache/coursier
key: coursier-build-spark-connect-python-only-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-coursier-build-spark-connect-python-only-${{ hashFiles('**/pom.xml') }}
restore-keys: |
coursier-build-spark-connect-python-only-
${{ runner.os }}-coursier-build-spark-connect-python-only-
- name: Install Java 17
uses: actions/setup-java@v5
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_sparkr_window.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ jobs:
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: build-sparkr-windows-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-build-sparkr-windows-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
build-sparkr-windows-maven-
${{ runner.os }}-build-sparkr-windows-maven-
- name: Install Java 17
uses: actions/setup-java@v5
with:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/maven_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,18 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Cache Maven local repository
# TODO(SPARK-54466): https://github.com/actions/runner-images/issues/13341
if: ${{ runner.os != 'macOS' }}
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: java${{ inputs.java }}-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-java${{ inputs.java }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
java${{ inputs.java }}-maven-
${{ runner.os }}-java${{ inputs.java }}-maven-
- name: Install Java ${{ inputs.java }}
uses: actions/setup-java@v5
with:
Expand Down Expand Up @@ -240,18 +240,18 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Cache Maven local repository
# TODO(SPARK-54466): https://github.com/actions/runner-images/issues/13341
if: ${{ runner.os != 'macOS' }}
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: java${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-java${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
java${{ matrix.java }}-maven-
${{ runner.os }}-java${{ matrix.java }}-maven-
- name: Install Java ${{ matrix.java }}
uses: actions/setup-java@v5
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ jobs:
uses: actions/cache@v5
with:
path: ~/.m2/repository
key: snapshot-maven-${{ hashFiles('**/pom.xml') }}
key: ${{ runner.os }}-snapshot-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
snapshot-maven-
${{ runner.os }}-snapshot-maven-
- name: Install Java 8 for branch-3.x
if: matrix.branch == 'branch-3.5'
uses: actions/setup-java@v5
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_hosted_runner_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ jobs:
build/apache-maven-*
build/*.jar
~/.sbt
key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
restore-keys: |
build-
${{ runner.os }}-build-
- name: Cache Coursier local repository
# TODO(SPARK-54466): https://github.com/actions/runner-images/issues/13341
if: ${{ runner.os != 'macOS' }}
Expand Down