diff --git a/.forgejo/workflows/nix-build.yaml b/.forgejo/workflows/nix-build.yaml index 735a539..8f500d2 100644 --- a/.forgejo/workflows/nix-build.yaml +++ b/.forgejo/workflows/nix-build.yaml @@ -9,7 +9,7 @@ on: jobs: nix/build: - runs-on: nixos-latest + runs-on: nixos-flakes steps: - name: checkout uses: actions/checkout@v3 diff --git a/.forgejo/workflows/nix-develop.yaml b/.forgejo/workflows/nix-develop.yaml index be273c1..a4d5b8f 100644 --- a/.forgejo/workflows/nix-develop.yaml +++ b/.forgejo/workflows/nix-develop.yaml @@ -9,7 +9,7 @@ on: jobs: nix/develop: - runs-on: nixos-latest + runs-on: nixos-flakes steps: - name: checkout uses: actions/checkout@v3 diff --git a/.forgejo/workflows/nix-shell.yaml b/.forgejo/workflows/nix-shell.yaml index 16f7e81..4073121 100644 --- a/.forgejo/workflows/nix-shell.yaml +++ b/.forgejo/workflows/nix-shell.yaml @@ -10,7 +10,7 @@ on: jobs: nix/shell: - runs-on: nixos-latest + runs-on: nixos-flakes steps: - name: checkout uses: actions/checkout@v3 @@ -23,6 +23,19 @@ jobs: run: | hello + - name: ensure we're not in a dev environment + uses: ./shell + with: + flake: ./shell/test + package: "hello" + run: | + set -x + + # if we have gcc installed, we're in a dev environment. + # we don't want to be in a dev environment + type -p gcc >/dev/null && exit 1 + hello + - name: no commands should still work uses: ./shell with: diff --git a/.forgejo/workflows/noop.yaml b/.forgejo/workflows/noop.yaml new file mode 100644 index 0000000..29b4582 --- /dev/null +++ b/.forgejo/workflows/noop.yaml @@ -0,0 +1,13 @@ +--- +name: Nothing. + +on: + push: + +jobs: + nothing: + runs-on: nixos-flakes + + steps: + - name: no-op + run: echo "This is only here to make Ironforge happy." diff --git a/.forgejo/workflows/shellcheck.yaml b/.forgejo/workflows/shellcheck.yaml index e4d348e..3eb2700 100644 --- a/.forgejo/workflows/shellcheck.yaml +++ b/.forgejo/workflows/shellcheck.yaml @@ -9,7 +9,7 @@ on: jobs: shellcheck: - runs-on: nixos-latest + runs-on: nixos-flakes steps: - name: checkout diff --git a/build/bin/nix-build b/build/bin/nix-build index 8085c3e..a02c178 100755 --- a/build/bin/nix-build +++ b/build/bin/nix-build @@ -8,9 +8,5 @@ case "${INPUT_LOGS}" in ;; esac -exec 2>&1 - -echo "##[group]Building ${INPUT_PACKAGE}" nix build ${LOGS} --out-link "${INPUT_OUT_LINK}" "${INPUT_FLAKE}#${INPUT_PACKAGE}" echo "output-path=$(readlink "${INPUT_OUT_LINK}")" >>"${GITHUB_OUTPUT}" -echo "##[endgroup]"