Skip to content

Commit d6aae47

Browse files
committed
Publish cmake and ninja as zips (4/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. + Do not run cmake and ninja jobs without proper tags
1 parent e54bc5a commit d6aae47

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

.github/workflows/cmake-build.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,21 @@
1111
# #
1212
##########################################################################
1313

14-
name: Publish CMake suitable for dk.exe bootstrap
14+
# What does suitable mean?
15+
# 1. On Linux either a low glibc version or none at all (musl static linking)
16+
# 2. The cmake archive is a zip file since there is fast native support for
17+
# zipfiles in dk.exe using MlFront_ZipFile.
18+
name: CMake suitable for dk.exe bootstrap
1519

1620
on:
1721
push:
1822

1923
jobs:
2024
build-static:
2125
runs-on: ubuntu-latest
26+
# We never want the DkCoder version numbers to conflict with the CMake releases.
27+
# So use tags that are real CMake versions. Example: cmake-3.25.2
28+
if: startsWith(github.ref, 'refs/tags/cmake-')
2229

2330
strategy:
2431
matrix:
@@ -74,6 +81,7 @@ jobs:
7481

7582
rearchive-as-zip:
7683
runs-on: ubuntu-latest
84+
if: startsWith(github.ref, 'refs/tags/cmake-')
7785

7886
strategy:
7987
matrix:
@@ -106,8 +114,6 @@ jobs:
106114
needs:
107115
- build-static
108116
- rearchive-as-zip
109-
# We never want the DkCoder version numbers to conflict with the CMake releases.
110-
# So use tags that are real CMake versions. Example: cmake-3.25.2
111117
if: startsWith(github.ref, 'refs/tags/cmake-')
112118
steps:
113119
- name: Download CMake archives

.github/workflows/ninja-build.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@
1111
# #
1212
##########################################################################
1313

14-
name: Publish ninja-build suitable for dk.exe bootstrap
14+
# What does suitable mean?
15+
# 1. On Linux either a low glibc version or none at all (musl static linking)
16+
name: ninja-build suitable for dk.exe bootstrap
1517

1618
on:
1719
push:
1820

1921
jobs:
2022
build-static:
2123
runs-on: ubuntu-latest
24+
# We never want the DkCoder version numbers to conflict with the Ninja releases.
25+
# So use tags that are real Ninja versions. Example: ninja-1.12.1
26+
if: startsWith(github.ref, 'refs/tags/ninja-')
2227

2328
strategy:
2429
matrix:
@@ -42,7 +47,7 @@ jobs:
4247
- name: Set up Docker Buildx
4348
uses: docker/setup-buildx-action@v3
4449

45-
# We aren't use cross-compilation. Instead we have multiple platforms
50+
# We aren't using cross-compilation. Instead we have multiple platforms
4651
# with QEMU emulation providing a native environment. An alternative
4752
# is to use CMake to build Ninja with a cross-compiler.
4853
- name: Build ${{ matrix.platform }} and export to filesystem
@@ -74,8 +79,6 @@ jobs:
7479
contents: write
7580
runs-on: ubuntu-latest
7681
needs: build-static
77-
# We never want the DkCoder version numbers to conflict with the Ninja releases.
78-
# So use tags that are real Ninja versions. Example: ninja-1.12.1
7982
if: startsWith(github.ref, 'refs/tags/ninja-')
8083
steps:
8184
- name: Download ninja binaries

0 commit comments

Comments
 (0)