Skip to content

Commit 5a4b4cd

Browse files
authored
Use GITHUB_ENV to persist Swift version (#903)
1 parent 22a9949 commit 5a4b4cd

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
steps:
5858
- uses: actions/checkout@master
5959
- name: Select Xcode version
60-
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app; swift -version
60+
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
6161
- name: Install Swiftly
6262
if: ${{ matrix.swiftly }}
6363
run: |
@@ -75,8 +75,9 @@ jobs:
7575
- name: Get Swift Version
7676
id: get-swift-version
7777
run: |
78-
swift -version
79-
echo "::set-output name=version::$(swift -version | head -n 1 | sed s/,// )"
78+
swift_version=$(swift -version | head -n 1 | sed s/,//)
79+
echo "$swift_version"
80+
echo "SWIFT_VERSION=${swift_version}" >> "$GITHUB_ENV"
8081
shell: bash
8182
- name: Cache resolved dependencies
8283
id: cache-resolved-dependencies
@@ -85,9 +86,9 @@ jobs:
8586
path: |
8687
.build
8788
Package.resolved
88-
key: ${{ runner.os }}-${{ matrix.xcode }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('Package.swift', 'Package.resolved') }}
89+
key: ${{ runner.os }}-${{ matrix.xcode }}-${{ env.SWIFT_VERSION }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('Package.swift', 'Package.resolved') }}
8990
restore-keys: |
90-
${{ runner.os }}-${{ matrix.xcode }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-
91+
${{ runner.os }}-${{ matrix.xcode }}-${{ env.SWIFT_VERSION }}-${{ env.cache_version }}-spm-deps-
9192
- name: Resolve dependencies
9293
if: steps.cache-resolved-dependencies.outputs.cache-hit != 'true'
9394
run: ${{ env.swift_package_resolve }}
@@ -119,8 +120,9 @@ jobs:
119120
- name: Get Swift Version
120121
id: get-swift-version
121122
run: |
122-
swift -version
123-
echo "::set-output name=version::$(swift -version | head -n 1 | sed s/,// )"
123+
swift_version=$(swift -version | head -n 1 | sed s/,//)
124+
echo "$swift_version"
125+
echo "SWIFT_VERSION=${swift_version}" >> "$GITHUB_ENV"
124126
shell: bash
125127
- name: Cache resolved dependencies
126128
id: cache-resolved-dependencies
@@ -129,9 +131,9 @@ jobs:
129131
path: |
130132
.build
131133
Package.resolved
132-
key: ${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('Package.swift', 'Package.resolved') }}
134+
key: ${{ runner.os }}-${{ env.SWIFT_VERSION }}-${{ env.cache_version }}-spm-deps-${{ hashFiles('Package.swift', 'Package.resolved') }}
133135
restore-keys: |
134-
${{ runner.os }}-${{ steps.get-swift-version.outputs.version }}-${{ env.cache_version }}-spm-deps-
136+
${{ runner.os }}-${{ env.SWIFT_VERSION }}-${{ env.cache_version }}-spm-deps-
135137
- name: Resolve dependencies
136138
if: steps.cache-resolved-dependencies.outputs.cache-hit != 'true'
137139
run: ${{ env.swift_package_resolve }}

0 commit comments

Comments
 (0)