From ab59f5447130e8f104355178a4c81e37935c730e Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Tue, 3 Mar 2026 20:44:05 +0100 Subject: [PATCH] workflows/ci: Don't build packages and workstations --- .github/workflows/build-host.yml | 30 --------------- .github/workflows/ci.yml | 66 ++++++++++---------------------- 2 files changed, 20 insertions(+), 76 deletions(-) delete mode 100644 .github/workflows/build-host.yml diff --git a/.github/workflows/build-host.yml b/.github/workflows/build-host.yml deleted file mode 100644 index 392691a..0000000 --- a/.github/workflows/build-host.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Build host -on: - workflow_call: - inputs: - hosts: - required: true - type: string - secrets: - CACHIX_AUTH_TOKEN: - required: true -jobs: - build-host: - name: ${{ matrix.host }} - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - host: ${{ fromJson(inputs.hosts) }} - steps: - - uses: actions/checkout@v5 - - uses: cachix/install-nix-action@v31 - with: - extra_nix_config: experimental-features = nix-command flakes pipe-operators - - uses: cachix/cachix-action@v15 - with: - name: sebastian-stork - authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - useDaemon: false - - name: Build host - run: nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel --print-build-logs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 376bf53..0b7cfd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,11 +16,6 @@ jobs: - uses: cachix/install-nix-action@v31 with: extra_nix_config: experimental-features = nix-command flakes pipe-operators - - name: Get packages - id: packages - run: | - packages=$(nix flake show --json | jq -c '.packages."x86_64-linux" | keys') - printf "packages=%s" "$packages" >> "$GITHUB_OUTPUT" - name: Get checks id: checks run: | @@ -32,38 +27,11 @@ jobs: servers=$(nix eval .#nixosConfigurations --apply 'configs: configs |> builtins.attrNames - |> builtins.filter (name: configs.${name}.config.custom.services.comin.enable) + |> builtins.filter (hostName: configs.${hostName}.config.custom.services.comin.enable) ' --json) printf "servers=%s" "$servers" >> "$GITHUB_OUTPUT" - - name: Get workstations - id: workstations - run: | - workstations=$(nix eval .#nixosConfigurations --apply 'configs: - configs - |> builtins.attrNames - |> builtins.filter (name: !configs.${name}.config.custom.services.comin.enable) - ' --json) - printf "workstations=%s" "$workstations" >> "$GITHUB_OUTPUT" - build-package: - needs: parse-flake - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - package: ${{ fromJson(needs.parse-flake.outputs.packages) }} - steps: - - uses: actions/checkout@v5 - - uses: cachix/install-nix-action@v31 - with: - extra_nix_config: experimental-features = nix-command flakes pipe-operators - - uses: cachix/cachix-action@v15 - with: - name: sebastian-stork - authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - useDaemon: false - - name: Build package - run: nix build .#packages.x86_64-linux.${{ matrix.package }} --print-build-logs build-check: + name: ${{ matrix.check }} needs: parse-flake runs-on: ubuntu-latest strategy: @@ -83,19 +51,25 @@ jobs: - name: Build check run: nix build .#checks.x86_64-linux.${{ matrix.check }} --print-build-logs build-server: + name: ${{ matrix.server }} needs: parse-flake - uses: ./.github/workflows/build-host.yml - with: - hosts: ${{ needs.parse-flake.outputs.servers }} - secrets: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} - build-workstation: - needs: parse-flake - uses: ./.github/workflows/build-host.yml - with: - hosts: ${{ needs.parse-flake.outputs.workstations }} - secrets: - CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + server: ${{ fromJson(needs.parse-flake.outputs.servers) }} + steps: + - uses: actions/checkout@v5 + - uses: cachix/install-nix-action@v31 + with: + extra_nix_config: experimental-features = nix-command flakes pipe-operators + - uses: cachix/cachix-action@v15 + with: + name: sebastian-stork + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + useDaemon: false + - name: Build server + run: nix build .#nixosConfigurations.${{ matrix.server }}.config.system.build.toplevel --print-build-logs deploy: needs: [build-check, build-server] runs-on: ubuntu-latest