Skip to content

Commit 3a1afb8

Browse files
committed
Update action workflow tests
1 parent 388cd82 commit 3a1afb8

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

action.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,17 @@ runs:
115115
#swift-branch='swift-6.0.3-release'
116116
#swift-branch='swift-6.1-branch'
117117
#swift-branch='development'
118+
SWIFT_VERSION=${{ inputs.swift-version }}
118119
# translate swift-version "latest" into our known latest version
119-
if [ "${{ inputs.swift-version }}" == 'latest' ]; then
120+
if [ "${SWIFT_VERSION}" == 'latest' ]; then
120121
# fetch the most recent release tag from the toolchain repo
121122
#LATEST_TAG=$(curl -fsSL -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" --retry 10 --retry-max-time 600 https://api.github.com/repos/skiptools/swift-android-toolchain/releases/latest | jq -r '.tag_name')
122123
# disabled because it frequently gives "The requested URL returned error: 403"
123124
LATEST_TAG="6.0.3"
124125
SWIFT_VERSION=${LATEST_TAG}
125-
else
126-
echo "swift-version=${{ inputs.swift-version }}" >> $GITHUB_OUTPUT
127126
fi
128127
128+
echo "SWIFT_VERSION: ${SWIFT_VERSION}"
129129
echo "swift-version=${SWIFT_VERSION}" >> $GITHUB_OUTPUT
130130
131131
# the swift-id is the basename of the host toolchain download
@@ -134,6 +134,7 @@ runs:
134134
# a bare version name like "6.0.3" will have "-RELEASE" tacked on to the end
135135
SWIFT_VERSION_ID="${SWIFT_VERSION_ID}-RELEASE"
136136
fi
137+
echo "SWIFT_VERSION_ID: ${SWIFT_VERSION_ID}"
137138
echo "swift-id=${SWIFT_VERSION_ID}" >> $GITHUB_OUTPUT
138139
139140
SWIFT_BRANCH="${{ inputs.swift-branch }}"
@@ -149,6 +150,7 @@ runs:
149150
SWIFT_BRANCH="swift-${BASE_VERSION}-branch"
150151
fi
151152
fi
153+
echo "SWIFT_BRANCH: ${SWIFT_BRANCH}"
152154
echo "swift-branch=${SWIFT_BRANCH}" >> $GITHUB_OUTPUT
153155
154156
- name: Cache Swift ${{ steps.setup.outputs.swift-version }} Host Toolchain

0 commit comments

Comments
 (0)