From 63638373b7590d23d205a94e7317fb0afd3f3e36 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Thu, 7 Aug 2025 21:59:36 +0200 Subject: [PATCH] squish --- .forgejo/workflows/cache.yaml | 10 +++------- .forgejo/workflows/ci.yaml | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.forgejo/workflows/cache.yaml b/.forgejo/workflows/cache.yaml index 976f57b1..2ad0c5a9 100644 --- a/.forgejo/workflows/cache.yaml +++ b/.forgejo/workflows/cache.yaml @@ -13,15 +13,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Configure cache - run: nix-shell --run "attic login fediversity https://attic.fediversity.net ${{ secrets.ATTIC_PUSH_KEY }} && attic use demo" - - - name: Set up SSH key to access age secrets + - name: Cache run: | + nix-shell --run "attic login fediversity https://attic.fediversity.net ${{ secrets.ATTIC_PUSH_KEY }} && attic use demo" env mkdir -p ~/.ssh echo "${{ secrets.CD_SSH_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - - - name: Cache - run: nix-shell --run "attic push demo $(nix-build)" + nix-shell --run "attic push demo $(nix-build)" diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 0f23e498..2691c14f 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -21,18 +21,14 @@ jobs: - uses: actions/checkout@v4 - run: nix-shell --run 'nix-unit ./deployment/data-model-test.nix' - - name: Configure cache - run: nix-shell --run "attic login fediversity https://attic.fediversity.net ${{ secrets.ATTIC_PUSH_KEY }} && attic use demo" - - - name: Set up SSH key to access age secrets + - name: Cache run: | + nix-shell --run "attic login fediversity https://attic.fediversity.net ${{ secrets.ATTIC_PUSH_KEY }} && attic use demo" env mkdir -p ~/.ssh echo "${{ secrets.CD_SSH_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - - - name: Cache - run: nix-shell --run "attic push demo $(nix-build)" + nix-shell --run "attic push demo $(nix-build)" check-mastodon: runs-on: native