mirror of
https://codeberg.org/icewind/attic-action.git
synced 2026-06-03 17:44:07 +02:00
Merge pull request #31 from cachix/fix-pr-build
call nix-build even if signing key is not set
This commit is contained in:
commit
9cc8b08cb0
2 changed files with 37 additions and 29 deletions
32
lib/main.js
32
lib/main.js
|
|
@ -43,22 +43,26 @@ function run() {
|
|||
core.endGroup();
|
||||
if (signingKey !== "") {
|
||||
core.exportVariable('CACHIX_SIGNING_KEY', signingKey);
|
||||
if (skipNixBuild !== 'true') {
|
||||
core.startGroup(`Invoking nix-build`);
|
||||
}
|
||||
if (skipNixBuild !== 'true') {
|
||||
core.startGroup(`Invoking nix-build`);
|
||||
if (signingKey !== "") {
|
||||
// Remember existing store paths
|
||||
yield exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > store-path-pre-build`]);
|
||||
let paths = '';
|
||||
const options = {
|
||||
listeners: {
|
||||
stdout: (data) => {
|
||||
paths += data.toString();
|
||||
},
|
||||
}
|
||||
};
|
||||
const args = strings_1.prependEach('-A', strings_1.nonEmptySplit(attributes, /\s+/)).concat([file || "default.nix"]);
|
||||
const additionalArgs = strings_1.nonEmptySplit(nixBuildArgs, /\s+/);
|
||||
yield exec.exec('nix-build', additionalArgs.concat(args), options);
|
||||
core.endGroup();
|
||||
}
|
||||
let paths = '';
|
||||
const options = {
|
||||
listeners: {
|
||||
stdout: (data) => {
|
||||
paths += data.toString();
|
||||
},
|
||||
}
|
||||
};
|
||||
const args = strings_1.prependEach('-A', strings_1.nonEmptySplit(attributes, /\s+/)).concat([file || "default.nix"]);
|
||||
const additionalArgs = strings_1.nonEmptySplit(nixBuildArgs, /\s+/);
|
||||
yield exec.exec('nix-build', additionalArgs.concat(args), options);
|
||||
core.endGroup();
|
||||
if (signingKey !== "") {
|
||||
core.startGroup('Cachix: Pushing paths');
|
||||
yield exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' | cat - store-path-pre-build | sort | uniq -u | ${cachixExecutable} push ${name}`]);
|
||||
core.endGroup();
|
||||
|
|
|
|||
32
src/main.ts
32
src/main.ts
|
|
@ -31,26 +31,30 @@ async function run() {
|
|||
|
||||
if (signingKey !== "") {
|
||||
core.exportVariable('CACHIX_SIGNING_KEY', signingKey);
|
||||
}
|
||||
|
||||
if (skipNixBuild !== 'true') {
|
||||
core.startGroup(`Invoking nix-build`);
|
||||
if (skipNixBuild !== 'true') {
|
||||
core.startGroup(`Invoking nix-build`);
|
||||
|
||||
if (signingKey !== "") {
|
||||
// Remember existing store paths
|
||||
await exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > store-path-pre-build`]);
|
||||
}
|
||||
|
||||
let paths = '';
|
||||
const options = {
|
||||
listeners: {
|
||||
stdout: (data: Buffer) => {
|
||||
paths += data.toString();
|
||||
},
|
||||
}
|
||||
};
|
||||
const args = prependEach('-A', nonEmptySplit(attributes, /\s+/)).concat([file || "default.nix"]);
|
||||
const additionalArgs = nonEmptySplit(nixBuildArgs, /\s+/);
|
||||
await exec.exec('nix-build', additionalArgs.concat(args), options);
|
||||
core.endGroup()
|
||||
let paths = '';
|
||||
const options = {
|
||||
listeners: {
|
||||
stdout: (data: Buffer) => {
|
||||
paths += data.toString();
|
||||
},
|
||||
}
|
||||
};
|
||||
const args = prependEach('-A', nonEmptySplit(attributes, /\s+/)).concat([file || "default.nix"]);
|
||||
const additionalArgs = nonEmptySplit(nixBuildArgs, /\s+/);
|
||||
await exec.exec('nix-build', additionalArgs.concat(args), options);
|
||||
core.endGroup()
|
||||
|
||||
if (signingKey !== "") {
|
||||
core.startGroup('Cachix: Pushing paths');
|
||||
await exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' | cat - store-path-pre-build | sort | uniq -u | ${cachixExecutable} push ${name}`]);
|
||||
core.endGroup();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue