Skip to content

Commit 71f38c3

Browse files
typo
1 parent 6b969bb commit 71f38c3

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/actions/download-pre-built-deps/action.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ runs:
3838
preBuiltDeps='${{ github.workspace }}/buildspec.json'
3939
baseURL=$(jq -r '.baseUrl' $preBuiltDeps)
4040
version=$(jq -r '.version' $preBuiltDeps)
41-
downloadHash=$(jq -r '.hashes .${{ inputs.os }} .${{ inputs.architecture }} .qt${{ inputs.qt_version }} .${{ inputs.build_type == 'pull_request' && 'debug' || 'release' }}' $preBuiltDeps)
42-
downloadFilename=${{ inputs.os }}-${{ inputs.architecture }}-qt${{ inputs.qt_version }}-${{ inputs.build_type == 'pull_request' && 'debug' || 'release' }}-$version.tar.gz
41+
downloadHash=$(jq -r '.hashes .${{ inputs.os }} .${{ inputs.architecture }} .qt${{ inputs.qt_version }} .${{ inputs.build_type }}' $preBuiltDeps)
42+
downloadFilename=${{ inputs.os }}-${{ inputs.architecture }}-qt${{ inputs.qt_version }}-${{ inputs.build_type }}-$version.tar.gz
43+
echo 💾 Download "$downloadFilename"...
4344
curl -OL "$baseURL"/"$version"/"$downloadFilename"
4445
if [[ ${{ inputs.os }} == 'windows' ]]; then
4546
computedHash=$(powershell -Command "(Get-FileHash -Path \"$downloadFilename\" -Algorithm SHA256).Hash.ToLower()")
@@ -48,13 +49,16 @@ runs:
4849
computedHash=$(sha256sum "$downloadFilename" | awk '{print $1}')
4950
destDir=/tmp/deps
5051
fi
52+
echo 👀 Check Hash"...
5153
if [[ "$computedHash" == "$downloadHash" ]]; then
5254
mkdir "$destDir"
5355
tar -xzf "$downloadFilename" -C "$destDir"
5456
if [[ ${{ inputs.os }} != 'windows' ]]; then
5557
chmod +x "$destDir"/bin/*
5658
fi
59+
echo ✅ Hash check passed."
5760
echo "cmake-args="-DUSE_PRE_BUILT_DEPS=ON -DPRE_BUILT_DEPS_DIR=$destDir"" >> $GITHUB_OUTPUT
5861
else
62+
echo ❌ Hash check failed."
5963
echo "cmake-args=" >> $GITHUB_OUTPUT
6064
fi

dependencies/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ if(ENABLE_FLATBUF_SERVER OR ENABLE_FLATBUF_CONNECT)
266266
endif()
267267

268268
if(NOT TARGET flatc)
269-
if(USE_PRE_BUILD_DEPS)
269+
if(USE_PRE_BUILT_DEPS)
270270
add_executable(flatc IMPORTED GLOBAL)
271271
set_target_properties(flatc PROPERTIES
272272
IMPORTED_LOCATION ${PRE_BUILT_DEPS_DIR}/bin/flatc${CMAKE_EXECUTABLE_SUFFIX}

0 commit comments

Comments
 (0)