Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

daemon: fix support check in post run #166

Merged
merged 1 commit into from
Jan 12, 2024
Merged

daemon: fix support check in post run #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dist/main/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7745,7 +7745,7 @@ const pathsToPush = core.getInput('pathsToPush');
const pushFilter = core.getInput('pushFilter');
const cachixArgs = core.getInput('cachixArgs');
const skipAddingSubstituter = core.getInput('skipAddingSubstituter');
const useDaemon = (core.getInput('useDaemon') === 'true') ? true : false;
const useDaemon = core.getBooleanInput('useDaemon');
const cachixBinInput = core.getInput('cachixBin');
const installCommand = core.getInput('installCommand') ||
"nix-env --quiet -j8 -iA cachix -f https://cachix.org/api/v1/install";
Expand Down Expand Up @@ -7858,7 +7858,7 @@ async function setup() {
async function upload() {
core.startGroup('Cachix: push');
const cachixBin = core.getState('cachixBin');
const supportsDaemon = core.getState('supportsDaemon');
const supportsDaemon = core.getState('supportsDaemon') === 'true';
try {
if (skipPush === 'true') {
core.info('Pushing is disabled as skipPush is set to true');
Expand All @@ -7867,7 +7867,7 @@ async function upload() {
if (useDaemon && supportsDaemon) {
const daemonDir = process.env[ENV_CACHIX_DAEMON_DIR];
if (!daemonDir) {
core.debug('Cachix Daemon not started. Skipping push');
core.error('Cachix Daemon not started. Skipping push');
return;
}
const daemonPid = parseInt(await fs.readFile(pidFilePath(daemonDir), { encoding: 'utf8' }));
Expand Down
6 changes: 3 additions & 3 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const pathsToPush = core.getInput('pathsToPush');
const pushFilter = core.getInput('pushFilter');
const cachixArgs = core.getInput('cachixArgs');
const skipAddingSubstituter = core.getInput('skipAddingSubstituter');
const useDaemon = (core.getInput('useDaemon') === 'true') ? true : false;
const useDaemon = core.getBooleanInput('useDaemon');
const cachixBinInput = core.getInput('cachixBin');
const installCommand =
core.getInput('installCommand') ||
Expand Down Expand Up @@ -153,7 +153,7 @@ async function upload() {
core.startGroup('Cachix: push');

const cachixBin = core.getState('cachixBin');
const supportsDaemon = core.getState('supportsDaemon');
const supportsDaemon = core.getState('supportsDaemon') === 'true';

try {
if (skipPush === 'true') {
Expand All @@ -163,7 +163,7 @@ async function upload() {
const daemonDir = process.env[ENV_CACHIX_DAEMON_DIR];

if (!daemonDir) {
core.debug('Cachix Daemon not started. Skipping push');
core.error('Cachix Daemon not started. Skipping push');
return;
}

Expand Down
Loading