diff --git a/.forgejo/workflows/nix-build.yaml b/.forgejo/workflows/nix-build.yaml index 8f500d2..735a539 100644 --- a/.forgejo/workflows/nix-build.yaml +++ b/.forgejo/workflows/nix-build.yaml @@ -9,7 +9,7 @@ on: jobs: nix/build: - runs-on: nixos-flakes + runs-on: nixos-latest steps: - name: checkout uses: actions/checkout@v3 diff --git a/.forgejo/workflows/nix-develop.yaml b/.forgejo/workflows/nix-develop.yaml index a4d5b8f..be273c1 100644 --- a/.forgejo/workflows/nix-develop.yaml +++ b/.forgejo/workflows/nix-develop.yaml @@ -9,7 +9,7 @@ on: jobs: nix/develop: - runs-on: nixos-flakes + runs-on: nixos-latest steps: - name: checkout uses: actions/checkout@v3 diff --git a/.forgejo/workflows/nix-shell.yaml b/.forgejo/workflows/nix-shell.yaml index 4073121..16f7e81 100644 --- a/.forgejo/workflows/nix-shell.yaml +++ b/.forgejo/workflows/nix-shell.yaml @@ -10,7 +10,7 @@ on: jobs: nix/shell: - runs-on: nixos-flakes + runs-on: nixos-latest steps: - name: checkout uses: actions/checkout@v3 @@ -23,19 +23,6 @@ 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 deleted file mode 100644 index 29b4582..0000000 --- a/.forgejo/workflows/noop.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 3eb2700..e4d348e 100644 --- a/.forgejo/workflows/shellcheck.yaml +++ b/.forgejo/workflows/shellcheck.yaml @@ -9,7 +9,7 @@ on: jobs: shellcheck: - runs-on: nixos-flakes + runs-on: nixos-latest steps: - name: checkout diff --git a/build/bin/nix-build b/build/bin/nix-build index a02c178..8085c3e 100755 --- a/build/bin/nix-build +++ b/build/bin/nix-build @@ -8,5 +8,9 @@ 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]"