robin/attic-action
1
0
Fork 0
mirror of https://codeberg.org/icewind/attic-action.git synced 2026-06-03 17:44:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #31 from cachix/fix-pr-build

Browse source 
call nix-build even if signing key is not set
This commit is contained in:
Domen Kožar 2020-03-01 11:18:00 +01:00 • committed by GitHub
commit 9cc8b08cb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/main.js
View file

@ -43,10 +43,13 @@ function run() {
core.endGroup();
if (signingKey !== "") {
core.exportVariable('CACHIX_SIGNING_KEY', signingKey);
}
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: {
@ -59,6 +62,7 @@ function run() {
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();

4
src/main.ts
View file

@ -31,12 +31,15 @@ async function run() {
if (signingKey !== "") {
core.exportVariable('CACHIX_SIGNING_KEY', signingKey);
}
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 = {
@ -51,6 +54,7 @@ async function run() {
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();