Skip to content

Commit 6ecab5e

Browse files
committed
fix: fix ninja version on Alpine
1 parent 8eb691a commit 6ecab5e

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

dist/legacy/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/modern/setup-cpp.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ninja/ninja.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { addPath } from "envosman"
22
import { addExeExt } from "patha"
3-
import { hasApk, installApkPack } from "setup-alpine"
3+
import { enableCommunityRepository, hasApk, installApkPack } from "setup-alpine"
44
import { rcOptions } from "../cli-options.js"
55
import { arm64, x86, x86_64 } from "../utils/env/arch.js"
66
import { type InstallationInfo, type PackageInfo, setupBin } from "../utils/setup/setupBin.js"
@@ -42,11 +42,15 @@ function getNinjaPackageInfo(version: string, platform: NodeJS.Platform, arch: s
4242

4343
export async function setupNinja(version: string, setupDir: string, arch: string): Promise<InstallationInfo> {
4444
if (await hasApk()) {
45+
await enableCommunityRepository()
4546
await installApkPack([
4647
{
47-
name: "ninja",
48+
name: "ninja-build",
4849
// version,
4950
},
51+
{
52+
name: "ninja-is-really-ninja",
53+
},
5054
])
5155
await addPath("/usr/lib/ninja-build/bin", rcOptions)
5256
return {

0 commit comments

Comments
 (0)