mirrors/pikasTech-HWLAB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2410 from pikasTech/fix/go-env-cache-order

Browse Source 
fix: keep go env cache from invalidating npm layer
This commit is contained in:
Lyon
2026-07-06 23:17:54 +08:00
committed by GitHub
parent f5056e9867 b33fab85a4
commit 6b16897dbb
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/artifact-publish.mjs
+1 -1
View File
@@ -951,9 +951,9 @@ function envReuseDockerfile(baseImage, labels = [], recipe, service = null) {
...labels.map(([name, value]) => `LABEL ${name}=${dockerfileQuote(value)}`), ...labels.map(([name, value]) => `LABEL ${name}=${dockerfileQuote(value)}`),
"COPY package.json ./package.json", "COPY package.json ./package.json",
"COPY package-lock.json* ./", "COPY package-lock.json* ./",
...(goCacheEnabled ? ["COPY go.mod ./go.mod", "COPY go.sum* ./"] : []),
`RUN ${downloadEnvPrefix}${osPackageScript}`, `RUN ${downloadEnvPrefix}${osPackageScript}`,
`RUN ${downloadEnvPrefix}${downloadDependencyScript}`, `RUN ${downloadEnvPrefix}${downloadDependencyScript}`,
...(goCacheEnabled ? ["COPY go.mod ./go.mod", "COPY go.sum* ./"] : []),
...(goDownloadScript ? [goDownloadScript] : []), ...(goDownloadScript ? [goDownloadScript] : []),
`COPY ${normalizedRecipe.launcherPath} /usr/local/bin/hwlab-env-reuse-launcher.ts`, `COPY ${normalizedRecipe.launcherPath} /usr/local/bin/hwlab-env-reuse-launcher.ts`,
`RUN ${readinessScript}`, `RUN ${readinessScript}`,
scripts/ci-plan.test.mjs
+1
View File
@@ -362,6 +362,7 @@ test("artifact reuse paths preserve catalog provenance instead of current planne
const artifactPublish = await readFile("scripts/artifact-publish.mjs", "utf8"); const artifactPublish = await readFile("scripts/artifact-publish.mjs", "utf8");
assert.match(artifactPublish, /downloadDependencyScript/u); assert.match(artifactPublish, /downloadDependencyScript/u);
assert.match(artifactPublish, /RUN \$\{downloadEnvPrefix\}\$\{downloadDependencyScript\}/u); assert.match(artifactPublish, /RUN \$\{downloadEnvPrefix\}\$\{downloadDependencyScript\}/u);
assert.match(artifactPublish, /RUN \$\{downloadEnvPrefix\}\$\{downloadDependencyScript\}`,[\s\S]{0,120}\["COPY go\.mod \.\/go\.mod", "COPY go\.sum\* \.\/"\]/u);
assert.match(artifactPublish, /ln -sf "\$\{runtimeRoot\}\/\$bun_bin" \/usr\/local\/bin\/bun/u); assert.match(artifactPublish, /ln -sf "\$\{runtimeRoot\}\/\$bun_bin" \/usr\/local\/bin\/bun/u);
assert.doesNotMatch(artifactPublish, /RUN \$\{dependencyScript\}/u); assert.doesNotMatch(artifactPublish, /RUN \$\{dependencyScript\}/u);
assert.match(artifactPublish, /const catalogProvenance = serviceImageCatalogProvenance\(catalogService\);/u); assert.match(artifactPublish, /const catalogProvenance = serviceImageCatalogProvenance\(catalogService\);/u);