Skip to content

Commit 1c1863b

Browse files
committed
Publish cmake and ninja as zips (5/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. + Static Linux builds of Ninja should use .zip for consistently with Ninja's releases which are all .zip files. And sometimes firewalls block downloading executables.
1 parent 8120c97 commit 1c1863b

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/cmake-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
- name: Bundle cmake-${{ matrix.dkml_target_abi }}.zip
7373
run: X=$(pwd) && cd out/usr/local && zip -y -r $X/cmake-${{ matrix.dkml_target_abi }} cmake
7474

75-
- name: Upload cmake archives
75+
- name: Upload cmake archive
7676
uses: actions/upload-artifact@v4
7777
with:
7878
retention-days: 30

.github/workflows/ninja-build.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ jobs:
6464
if: matrix.testable
6565
run: out/usr/local/src/ninja-build/ninja --version
6666

67-
- name: Rename ninja binary to ninja-${{ matrix.dkml_target_abi }}
68-
run: mv out/usr/local/src/ninja-build/ninja ninja-${{ matrix.dkml_target_abi }}
67+
- name: Bundle ninja-${{ matrix.dkml_target_abi }}.zip
68+
run: X=$(pwd) && cd out/usr/local/src/ninja-build/ && zip -y $X/ninja-${{ matrix.dkml_target_abi }} ninja
6969

70-
- name: Upload ninja binary
70+
- name: Upload ninja archive
7171
uses: actions/upload-artifact@v4
7272
with:
7373
retention-days: 30
7474
name: ninja-${{ matrix.dkml_target_abi }}
75-
path: ninja-${{ matrix.dkml_target_abi }}
75+
path: ninja-${{ matrix.dkml_target_abi }}.zip
7676

7777
publish:
7878
permissions:
@@ -81,7 +81,7 @@ jobs:
8181
needs: build-static
8282
if: startsWith(github.ref, 'refs/tags/ninja-')
8383
steps:
84-
- name: Download ninja binaries
84+
- name: Download ninja archives
8585
uses: actions/download-artifact@v4
8686
with:
8787
pattern: ninja-*
@@ -90,6 +90,6 @@ jobs:
9090
uses: softprops/action-gh-release@v2
9191
with:
9292
files: |
93-
ninja-linux_x86_64
94-
ninja-linux_x86
95-
ninja-linux_arm64
93+
ninja-linux_x86_64.zip
94+
ninja-linux_x86.zip
95+
ninja-linux_arm64.zip

0 commit comments

Comments
 (0)