From 895b2fd2c838043df983270e008292fc0f76026a Mon Sep 17 00:00:00 2001 From: "Thing-han, Lim" <15379156+potsrevennil@users.noreply.github.com> Date: Thu, 2 Jan 2025 14:41:21 +0800 Subject: [PATCH] S --- .github/actions/setup-nix/action.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/setup-nix/action.yml b/.github/actions/setup-nix/action.yml index 943904f85..24687b737 100644 --- a/.github/actions/setup-nix/action.yml +++ b/.github/actions/setup-nix/action.yml @@ -66,7 +66,6 @@ runs: --no-confirm else sh <(curl -L https://nixos.org/nix/install) --no-daemon - fi if [[ ! -z $GH_TOKEN ]]; then @@ -147,7 +146,11 @@ runs: echo NIX_SHELL="${{ inputs.devShell }}" >> $GITHUB_ENV nix_extra_flags="${{ inputs.verbose == 'false' && '--quiet' || '' }} --experimental-features \"nix-command flakes\"" - echo SHELL="$(which nix) develop $nix_extra_flags .#${{ inputs.devShell }} -c bash -e {0}" >> $GITHUB_ENV + if [[ ${{ inputs.devShell }} == 'default' || ${{ inputs.devShell }} == '' ]]; then + echo SHELL="$(which nix) develop $nix_extra_flags -c bash -e {0}" >> $GITHUB_ENV + else + echo SHELL="$(which nix) develop $nix_extra_flags .#${{ inputs.devShell }} -c bash -e {0}" >> $GITHUB_ENV + fi echo "::endgroup::" - name: Prepare nix dev shell shell: ${{ env.SHELL }}