From 4e1af50ebdb4f7c103eaeb1cdf9160572f68b148 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Sun, 1 Sep 2024 17:21:30 +0200 Subject: [PATCH] ci: adapt to new format --- .forgejo/workflows/clippy-check.yml | 6 ------ .forgejo/workflows/nightly-release.yml | 18 +++++------------- .forgejo/workflows/stable-release.yml | 18 +++++------------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/.forgejo/workflows/clippy-check.yml b/.forgejo/workflows/clippy-check.yml index 2713b4b..da41463 100644 --- a/.forgejo/workflows/clippy-check.yml +++ b/.forgejo/workflows/clippy-check.yml @@ -11,12 +11,6 @@ jobs: runs-on: nix-flakes steps: - - name: Set up packages - run: | - echo "extra-substituters = https://builder.naxdy.org/attic" >> /etc/nix/nix.conf - echo "extra-trusted-public-keys = attic:05LdE8Nav5Qd1E+KOJqSwdr+WE1z8AUmSb3oKL7s8dk=" >> /etc/nix/nix.conf - nix profile install nixpkgs#nodejs "github:zhaofengli/attic?ref=6eabc3f02fae3683bffab483e614bebfcd476b21" - echo "PATH=/nix/var/nix/profiles/per-user/root/profile/bin:$PATH" >> "$GITHUB_ENV" - uses: actions/checkout@v4 - name: Run Clippy run: | diff --git a/.forgejo/workflows/nightly-release.yml b/.forgejo/workflows/nightly-release.yml index 874ecd2..e28ddd5 100644 --- a/.forgejo/workflows/nightly-release.yml +++ b/.forgejo/workflows/nightly-release.yml @@ -13,24 +13,16 @@ jobs: runs-on: nix-flakes steps: - - name: Set up packages - run: | - echo "extra-substituters = https://builder.naxdy.org/attic" >> /etc/nix/nix.conf - echo "extra-trusted-public-keys = attic:05LdE8Nav5Qd1E+KOJqSwdr+WE1z8AUmSb3oKL7s8dk=" >> /etc/nix/nix.conf - nix profile install nixpkgs#nodejs "github:zhaofengli/attic?ref=6eabc3f02fae3683bffab483e614bebfcd476b21" - echo "PATH=/nix/var/nix/profiles/per-user/root/profile/bin:$PATH" >> "$GITHUB_ENV" - name: Set up attic binary cache - run: | - attic login "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" "${{ vars.BINARY_CACHE_URL }}" "${{ secrets.PUBLIC_BINARY_CACHE_AUTH_KEY }}" - attic use "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" + uses: https://git.naxdy.org/NaxdyOrg/attic-action@v0.3 + with: + endpoint: "${{ vars.BINARY_CACHE_URL }}" + token: "${{ secrets.PUBLIC_BINARY_CACHE_AUTH_KEY }}" + cache: "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" - uses: actions/checkout@v4 - name: Build firmware image run: | nix build .# -o dist --print-build-logs - - name: Push derivations to binary cache - run: | - cd /nix/store - attic push "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" $(ls /nix/store --ignore='*.drv' --ignore='*fake_nixpkgs*') - name: (Re-)generate tag run: | git config --global user.email "noreply@naxdy.org" diff --git a/.forgejo/workflows/stable-release.yml b/.forgejo/workflows/stable-release.yml index b3c2d19..196a912 100644 --- a/.forgejo/workflows/stable-release.yml +++ b/.forgejo/workflows/stable-release.yml @@ -10,24 +10,16 @@ jobs: runs-on: nix-flakes steps: - - name: Set up packages - run: | - echo "extra-substituters = https://builder.naxdy.org/attic" >> /etc/nix/nix.conf - echo "extra-trusted-public-keys = attic:05LdE8Nav5Qd1E+KOJqSwdr+WE1z8AUmSb3oKL7s8dk=" >> /etc/nix/nix.conf - nix profile install nixpkgs#nodejs "github:zhaofengli/attic?ref=6eabc3f02fae3683bffab483e614bebfcd476b21" - echo "PATH=/nix/var/nix/profiles/per-user/root/profile/bin:$PATH" >> "$GITHUB_ENV" - name: Set up attic binary cache - run: | - attic login "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" "${{ vars.BINARY_CACHE_URL }}" "${{ secrets.PUBLIC_BINARY_CACHE_AUTH_KEY }}" - attic use "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" + uses: https://git.naxdy.org/NaxdyOrg/attic-action@v0.3 + with: + endpoint: "${{ vars.BINARY_CACHE_URL }}" + token: "${{ secrets.PUBLIC_BINARY_CACHE_AUTH_KEY }}" + cache: "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" - uses: actions/checkout@v4 - name: Build firmware image run: | nix build .# -o dist --print-build-logs - - name: Push derivations to binary cache - run: | - cd /nix/store - attic push "${{ vars.PUBLIC_BINARY_CACHE_NAME }}" $(ls /nix/store --ignore='*.drv' --ignore='*fake_nixpkgs*') - name: Publish stable release uses: https://gitea.com/actions/gitea-release-action@v1.3.0 with: -- 2.47.0