From 4cd9915a7caeaf1faba8028e5efc68e12872aff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Sun, 11 Feb 2024 22:24:32 +0100
Subject: [PATCH] .github: fix push job

---
 .github/actions/attic-push/action.yaml  | 20 --------------------
 .github/actions/install-nix/action.yaml |  2 +-
 .github/workflows/build.yaml            | 12 +++++++++---
 3 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 .github/actions/attic-push/action.yaml

diff --git a/.github/actions/attic-push/action.yaml b/.github/actions/attic-push/action.yaml
deleted file mode 100644
index cd0ecd0..0000000
--- a/.github/actions/attic-push/action.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: "Attic push"
-inputs:
-  from:
-    default: "."
-  server-url:
-    default: "https://attic.nrab.lol/"
-  server-name:
-    default: "nrab-attic"
-  cache:
-    default: "public"
-  paths:
-    default: "result"
-  token:
-    default: ${{ secrets.ATTIC_TOKEN }}
-runs:
-  using: "composite"
-  steps:
-    - run: |
-        nix run "${{ inputs.from }}"#attic -- login "${{ inputs.server-name }}" '${{ inputs.server-url }}' '${{ inputs.token }}'
-        nix run "${{ inputs.from }}"#attic -- push "${{ inputs.server-name }}":"${{ inputs.cache }}" ${{ inputs.paths }}
diff --git a/.github/actions/install-nix/action.yaml b/.github/actions/install-nix/action.yaml
index 26e6c4b..b78d9c1 100644
--- a/.github/actions/install-nix/action.yaml
+++ b/.github/actions/install-nix/action.yaml
@@ -22,6 +22,6 @@ runs:
           extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
           extra-trusted-public-keys = hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0=
           extra-trusted-public-keys = nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic=
-          extra-trusted-public-keys = cache.nrab.lol-1:wIIyvCTlsk39uwKlBFOuVY+BXrPY3lUNAEpDN4H+O0Q=
+          extra-trusted-public-keys = cache.nrab.lol-1:CJl1TouOyuJ1Xh4tZSXLwm3Upt06HzUNZmeyuEB9EZg=
           ${{ inputs.extra-conf }}
     - uses: DeterminateSystems/magic-nix-cache-action@main
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2653ecf..2395793 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,7 +36,9 @@ jobs:
       - name: Build output
         run: nix build .#${{ matrix.output }} -L
       - name: Push output
-        uses: ./.github/actions/attic-push
+        run: |
+          nix run .#attic -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }}
+          nix run .#attic -- push nrab-attic:public result
 
   build-aarch64-darwin:
     runs-on: macos-14
@@ -52,7 +54,9 @@ jobs:
       - name: Build output
         run: nix build .#${{ matrix.output }} -L
       - name: Push output
-        uses: ./.github/actions/attic-push
+        run: |
+          nix run .#attic -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }}
+          nix run .#attic -- push nrab-attic:public result
 
   build-aarch64-linux:
     runs-on: [Linux, ARM64, nix]
@@ -67,7 +71,9 @@ jobs:
       - name: Build output
         run: nix build .#${{ matrix.output }} -L
       - name: Push output
-        uses: ./.github/actions/attic-push
+        run: |
+          nix run .#attic -- login nrab-attic 'https://attic.nrab.lol' ${{ secrets.ATTIC_TOKEN }}
+          nix run .#attic -- push nrab-attic:public result
 
   all-built:
     runs-on: ubuntu-latest