Skip to content

Commit 6133d97

Browse files
committed
debugging
1 parent b950ce1 commit 6133d97

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/pull_request.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,27 @@ jobs:
4242
uses: actions/cache@v4
4343
continue-on-error: true
4444
with:
45-
path: ~/.gradle/caches
46-
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/build.gradle') }}-${{ hashFiles('**/build.gradle.kts') }}
45+
path: |
46+
~/.gradle/caches
47+
~/.gradle/wrapper
48+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
4749
restore-keys: |
48-
${{ runner.os }}-gradle-cache
4950
${{ runner.os }}-gradle-
5051
- name: Cache local SwiftPM repository
5152
uses: actions/cache@v4
5253
continue-on-error: true
5354
with:
54-
path: ~/.swiftpm/cache
55+
path: ~/.build/checkouts
5556
key: ${{ runner.os }}-swiftpm-cache-${{ hashFiles('Package.swift') }}
5657
restore-keys: |
5758
${{ runner.os }}-swiftpm-cache
5859
${{ runner.os }}-swiftpm-
5960
- name: Gradle build
60-
run: ./gradlew build --info --no-daemon
61+
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 ~/
6166

6267
test-swift:
6368
name: Swift tests (swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} os:${{ matrix.os_version }})
@@ -84,7 +89,7 @@ jobs:
8489
uses: actions/cache@v4
8590
continue-on-error: true
8691
with:
87-
path: ~/.gradle/cache
92+
path: ~/.build/checkouts
8893
key: ${{ runner.os }}-swiftpm-cache-${{ hashFiles('Package.swift') }}
8994
restore-keys: |
9095
${{ runner.os }}-swiftpm-cache

docker/install_untested_nightly_swift.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,15 @@ if [[ "$(grep "22.04" /etc/lsb-release)" = "" ]]; then
2424
fi
2525

2626
UNTESTED_TOOLCHAIN_URL=$(curl -s $SWIFT_UNTESTED_TOOLCHAIN_JOB_URL | grep 'Toolchain: ' | sed 's/Toolchain: //g')
27-
UNTESTED_TOOLCHAIN_FILENAME=$(echo "$UNTESTED_TOOLCHAIN_URL" | awk '
28-
function basename(file) {
29-
sub(".*/", "", file)
30-
return file
31-
}
32-
{print FILENAME, basename(FILENAME)}')
27+
UNTESTED_TOOLCHAIN_FILENAME=$"toolchain.tar.gz"
3328

3429
echo "Download toolchain: $UNTESTED_TOOLCHAIN_URL"
3530

3631
cd /
3732
curl -s "$UNTESTED_TOOLCHAIN_URL" > "$UNTESTED_TOOLCHAIN_FILENAME"
3833

34+
swift -version
35+
3936
echo "Extract toolchain: $UNTESTED_TOOLCHAIN_FILENAME"
4037
tar xzf "$UNTESTED_TOOLCHAIN_FILENAME"
41-
swift -version
38+
swift -version

0 commit comments

Comments
 (0)