From 72a6de5f9f441a5567899211c6b8e2ca34ab96c5 Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 18 Nov 2024 13:05:57 -0600 Subject: [PATCH] use nix action on update --- .github/workflows/update.yml | 39 ++++++++---------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 3e30608..7d587e2 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -28,27 +28,12 @@ jobs: private-key: ${{ secrets.SSH_PRIVATE_KEY }} - uses: daylin-bot/actions/setup@main - - uses: ./.github/actions/clean-disk + - uses: ./.github/actions/nix + with: + attic_token: ${{ secrets.ATTIC_TOKEN }} - run: git checkout -B flake-lock - - uses: DeterminateSystems/nix-installer-action@v15 - with: - source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux - extra-conf: | - experimental-features = pipe-operator - accept-flake-config = true - - - name: Install and login to attic cache - run: | - nix profile install "nixpkgs#attic-client" - attic login oizys https://attic.dayl.in "${{ secrets.ATTIC_TOKEN }}" - - # - uses: cachix/cachix-action@v15 - # with: - # name: daylin - # authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - name: Update nix flake run: | nix flake update --commit-lock-file @@ -69,8 +54,6 @@ jobs: --host "othalan" --flake . --debug - # -- - # --print-build-logs - name: Commit Updates uses: daylin-bot/actions/commit-and-push@main @@ -101,21 +84,16 @@ jobs: host: github.com private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - uses: DeterminateSystems/nix-installer-action@v15 + - uses: daylin-bot/actions/setup@main + - uses: ./.github/actions/nix with: - source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux - extra-conf: | - experimental-features = pipe-operator - accept-flake-config = true - - - uses: ./.github/actions/clean-disk - with: - purge-packages: 'true' + attic_token: ${{ secrets.ATTIC_TOKEN }} + clean: true + btrfs: true - name: Pre-build oizys run: nix build . - - name: Build run: > nix run . @@ -126,7 +104,6 @@ jobs: --debug -- --keep-going - # --print-build-logs --out-link current - run: git checkout flake-lock