Skip to content

Commit 529bfb1

Browse files
committed
gh actions globbing workaround
1 parent 6133d97 commit 529bfb1

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

.github/workflows/pull_request.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install JDK
3737
run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
3838
# TODO: not using setup-java since incompatible with the swiftlang/swift base image
39-
- name: Install Nightly Swift
39+
- name: Install Untested Nightly Swift
4040
run: "bash -xc './docker/install_untested_nightly_swift.sh'"
4141
- name: Cache local Gradle repository
4242
uses: actions/cache@v4
@@ -45,24 +45,20 @@ jobs:
4545
path: |
4646
~/.gradle/caches
4747
~/.gradle/wrapper
48-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
48+
key: ${{ runner.os }}-gradle-${{ hashFiles('*/*.gradle*', 'settings.gradle') }}
4949
restore-keys: |
5050
${{ runner.os }}-gradle-
5151
- name: Cache local SwiftPM repository
5252
uses: actions/cache@v4
5353
continue-on-error: true
5454
with:
55-
path: ~/.build/checkouts
55+
path: .build/checkouts
5656
key: ${{ runner.os }}-swiftpm-cache-${{ hashFiles('Package.swift') }}
5757
restore-keys: |
5858
${{ runner.os }}-swiftpm-cache
5959
${{ runner.os }}-swiftpm-
6060
- name: Gradle build
6161
run: ./gradlew update --info --no-daemon
62-
- name: List files for debugging
63-
run: pwd && find $(pwd)
64-
- name: List home files for debugging
65-
run: find ~/
6662

6763
test-swift:
6864
name: Swift tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
@@ -83,7 +79,7 @@ jobs:
8379
run: apt-get -qq update && apt-get -qq install -y make curl wget
8480
- name: Install JDK
8581
run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"
86-
- name: Install Nightly Swift
82+
- name: Install Untested Nightly Swift
8783
run: "bash -xc './docker/install_untested_nightly_swift.sh'"
8884
- name: Cache local SwiftPM repository
8985
uses: actions/cache@v4

0 commit comments

Comments
 (0)