Skip to content

Commit e54bc5a

Browse files
committed
Publish cmake and ninja as zips (3/n)
There is built-in fast support for extracting zips in DkCoder's dk.exe using MlFront_ZipFile. dk.exe must bootstrap cmake and ninja for the (legacy?) cmake user and system scripts. But for bootstrapping we shouldn't have to add tar.gz support. + Use redirections in curl when downloading cmake + Have publish job depend on rearchive-as-zip + Use matrix vars for rearchive-as-zip
1 parent 1a962c5 commit e54bc5a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/cmake-build.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
steps:
8888
- name: Download and repack
8989
run: |
90-
curl -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v${cmake_majminpat_ver}/cmake-${cmake_majminpat_ver}-${cmake_base_suffix}.tar.gz
90+
curl -Lo cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v${{matrix.cmake_majminpat_ver}}/cmake-${{matrix.cmake_majminpat_ver}}-${{matrix.cmake_base_suffix}}.tar.gz
9191
install -d dist && cd dist
9292
tar xfz ../cmake.tar.gz
9393
zip -y -r ../cmake-${{ matrix.abi }} *
@@ -103,7 +103,9 @@ jobs:
103103
permissions:
104104
contents: write
105105
runs-on: ubuntu-latest
106-
needs: build-static
106+
needs:
107+
- build-static
108+
- rearchive-as-zip
107109
# We never want the DkCoder version numbers to conflict with the CMake releases.
108110
# So use tags that are real CMake versions. Example: cmake-3.25.2
109111
if: startsWith(github.ref, 'refs/tags/cmake-')

0 commit comments

Comments
 (0)