diff --git a/.github/actions/clean-disk/action.yml b/.github/actions/clean-disk/action.yml index 0025d1b..3743b92 100644 --- a/.github/actions/clean-disk/action.yml +++ b/.github/actions/clean-disk/action.yml @@ -41,7 +41,7 @@ runs: sudo apt-get purge \ --allow-remove-essential \ -qq \ - $(non_manifest_packages) & + $(non_manifest_packages) > /dev/null & fi wait diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e33ef36..a2e40f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Build NixOS (on demand) on: workflow_dispatch: inputs: - host: + hosts: description: 'list of hosts to build' required: true default: 'othalan algiz' @@ -14,15 +14,14 @@ on: workflow_call: inputs: - host: + hosts: description: 'list of hosts to build' - required: true default: 'othalan aligz' type: string -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.host }} - cancel-in-progress: true +# concurrency: +# group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.host }} +# cancel-in-progress: true jobs: build: @@ -52,10 +51,12 @@ jobs: - name: Build run: | - for host in ${{ inputs.host }}; do - cachix watch-exec daylin -- \ - oizys build --system-path \ - --host "$host" \ - --flake . -- \ - --print-build-logs + for host in ${{ inputs.hosts }}; do + nix run . \ + -- \ + build --system-path \ + --host "$host" \ + --flake . \ + -- \ + --print-build-logs done diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index af5fddd..838dd3e 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -13,20 +13,6 @@ concurrency: cancel-in-progress: true jobs: - # checks: - # uses: ./.github/workflows/checks.yml - # secrets: inherit - build: - # needs: checks - strategy: - max-parallel: 1 - matrix: - host: - - othalan - # - mannaz - # - algiz uses: ./.github/workflows/build.yml - with: - host: "${{ matrix.host }}" secrets: inherit