mirror of
https://codeberg.org/icewind/attic-action.git
synced 2026-06-03 17:44:07 +02:00
allow auth token to be enough for pushing paths
This commit is contained in:
parent
e689c31e6e
commit
25971529fd
2 changed files with 18 additions and 8 deletions
14
dist/main/index.js
vendored
14
dist/main/index.js
vendored
|
|
@ -1052,7 +1052,7 @@ function setup() {
|
|||
core.startGroup('Cachix: installing');
|
||||
yield exec.exec('bash', ['-c', installCommand]);
|
||||
core.endGroup();
|
||||
// for private caches
|
||||
// for managed signing key and private caches
|
||||
if (authToken !== "") {
|
||||
yield exec.exec(cachixExecutable, ['authtoken', authToken]);
|
||||
}
|
||||
|
|
@ -1070,9 +1070,9 @@ function setup() {
|
|||
}
|
||||
if (signingKey !== "") {
|
||||
core.exportVariable('CACHIX_SIGNING_KEY', signingKey);
|
||||
// Remember existing store paths
|
||||
yield exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > /tmp/store-path-pre-build`]);
|
||||
}
|
||||
// Remember existing store paths
|
||||
yield exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > /tmp/store-path-pre-build`]);
|
||||
}
|
||||
catch (error) {
|
||||
core.setFailed(`Action failed with error: ${error}`);
|
||||
|
|
@ -1083,11 +1083,17 @@ function setup() {
|
|||
function upload() {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
try {
|
||||
if (signingKey !== "" && skipPush !== 'true') {
|
||||
if (skipPush === 'true') {
|
||||
core.info('Pushing is disabled as skipPush is set to true');
|
||||
}
|
||||
else if (signingKey !== "" || authToken !== "") {
|
||||
core.startGroup('Cachix: pushing paths');
|
||||
child_process_1.execFileSync(`${__dirname}/push-paths.sh`, [cachixExecutable, name], { stdio: 'inherit' });
|
||||
core.endGroup();
|
||||
}
|
||||
else {
|
||||
core.info('Pushing is disabled as signing key nor auth token are set.');
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
core.setFailed(`Action failed with error: ${error}`);
|
||||
|
|
|
|||
12
src/main.ts
12
src/main.ts
|
|
@ -22,7 +22,7 @@ async function setup() {
|
|||
await exec.exec('bash', ['-c', installCommand]);
|
||||
core.endGroup()
|
||||
|
||||
// for private caches
|
||||
// for managed signing key and private caches
|
||||
if (authToken !== "") {
|
||||
await exec.exec(cachixExecutable, ['authtoken', authToken]);
|
||||
}
|
||||
|
|
@ -43,9 +43,9 @@ async function setup() {
|
|||
|
||||
if (signingKey !== "") {
|
||||
core.exportVariable('CACHIX_SIGNING_KEY', signingKey);
|
||||
// Remember existing store paths
|
||||
await exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > /tmp/store-path-pre-build`]);
|
||||
}
|
||||
// Remember existing store paths
|
||||
await exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > /tmp/store-path-pre-build`]);
|
||||
} catch (error) {
|
||||
core.setFailed(`Action failed with error: ${error}`);
|
||||
throw (error);
|
||||
|
|
@ -54,10 +54,14 @@ async function setup() {
|
|||
|
||||
async function upload() {
|
||||
try {
|
||||
if (signingKey !== "" && skipPush !== 'true') {
|
||||
if (skipPush === 'true') {
|
||||
core.info('Pushing is disabled as skipPush is set to true');
|
||||
} else if (signingKey !== "" || authToken !== "") {
|
||||
core.startGroup('Cachix: pushing paths');
|
||||
execFileSync(`${__dirname}/push-paths.sh`, [cachixExecutable, name], { stdio: 'inherit' });
|
||||
core.endGroup();
|
||||
} else {
|
||||
core.info('Pushing is disabled as signing key nor auth token are set.');
|
||||
}
|
||||
} catch (error) {
|
||||
core.setFailed(`Action failed with error: ${error}`);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue