Skip to content

Commit ba81f6a

Browse files
committed
fix: do not use root for apk update
1 parent 5a0bbaf commit ba81f6a

File tree

9 files changed

+13
-21
lines changed

9 files changed

+13
-21
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.

packages/setup-alpine/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"ci-log": "workspace:*",
3030
"envosman": "workspace:*",
3131
"which": "4.0.0",
32-
"escape-string-regexp": "^5.0.0",
33-
"node-downloader-helper": "2.1.9",
32+
"execa": "7.2.0",
3433
"memoizee": "^0.4.17"
3534
},
3635
"engines": {

packages/setup-alpine/src/init-apt.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import { defaultExecOptions, execRootSync } from "admina"
22
import memoize from "memoizee"
33
import { filterAndQualifyApkPackages } from "./qualify-install.js"
4-
import { updateApkMemoized } from "./update.js"
54

65
/** Install bash (usually missing from docker containers) */
76
export async function initApk() {
8-
// Update the repos
9-
await updateApkMemoized()
10-
117
const toInstall = await filterAndQualifyApkPackages([
128
{ name: "bash" },
139
])

packages/setup-alpine/src/install-package.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ export async function installApkPackage(packages: ApkPackage[], update = false):
3232
try {
3333
// Update package index if requested
3434

35+
// init the apk
36+
await initApkMemoized()
37+
3538
if (update) {
3639
// Force update the repos
3740
await updateApkMemoized.clear()
3841
}
3942
// Update the repos if needed
4043
await updateApkMemoized()
4144

42-
// init the apk
43-
await initApkMemoized()
44-
4545
const packagesToInstall = await filterAndQualifyApkPackages(packages)
4646

4747
if (packagesToInstall.length === 0) {

packages/setup-alpine/src/update.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { execRoot } from "admina"
1+
import { execa } from "execa"
22
import memoizee from "memoizee"
33

44
async function updateApk() {
5-
await execRoot("apk", ["update"], { stdio: "inherit" })
5+
await execa("apk", ["update"], { stdio: "inherit" })
66
}
77
export const updateApkMemoized = memoizee(updateApk, { promise: true })

pnpm-lock.yaml

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)