From 868913d17904bf9ba0fced25ca2720698743736d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 5 Feb 2024 20:58:33 +0100 Subject: [PATCH] ci: Replace seed cachix workflow with new daemon mode cachix-action v14 added a new daemon mode, which pushes new derivations to the store as soon as they have been built. This replaces the seed cachix workflow nicely by just pushing from all jobs directly. --- .github/workflows/cachix.yaml | 72 ----------------------------------- .github/workflows/ci.yaml | 10 +++++ 2 files changed, 10 insertions(+), 72 deletions(-) delete mode 100644 .github/workflows/cachix.yaml diff --git a/.github/workflows/cachix.yaml b/.github/workflows/cachix.yaml deleted file mode 100644 index 2642a67993..0000000000 --- a/.github/workflows/cachix.yaml +++ /dev/null @@ -1,72 +0,0 @@ -name: Cachix - -# This workflow serves to -# - keep cachix up to date with the main branch -# - incrementally update cachix for large dependency -# updates, e.g. after running postgrest-nixpkgs-upgrade, -# which can cause the main CI workflow to time out - -on: - workflow_dispatch: - push: - branches: - - main - - rel-* - tags: - - v* - -jobs: - Seed-Cachix: - strategy: - fail-fast: false - matrix: - include: - - os: Linux - runs-on: ubuntu-latest - - os: MacOS - runs-on: macos-latest - name: Seed ${{ matrix.os }} - runs-on: ${{ matrix.runs-on }} - steps: - - uses: actions/checkout@v4 - - name: Setup Nix Environment - uses: ./.github/actions/setup-nix - with: - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - - name: Install cachix tooling - run: | - nix-env -f default.nix -iA devTools.pushCachix.bin - postgrest-push-cachix - - - name: Seed dynamic postgrest build - run: | - nix-build -A postgrestPackage - postgrest-push-cachix - - - name: Seed style tools - run: | - nix-build -A style - postgrest-push-cachix - - - name: Seed test tools - run: | - nix-build -A tests - postgrest-push-cachix - - - name: Seed static toolchain - if: matrix.os == 'Linux' - run: | - nix-build -A packagesStatic.hello - postgrest-push-cachix - - - name: Seed static postgrest build - if: matrix.os == 'Linux' - run: | - nix-build -A postgrestStatic - postgrest-push-cachix - - - name: Build and push everything to Cachix - run: | - nix-build - postgrest-push-cachix diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a872adf1a6..84ad16b9d3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,7 @@ jobs: - name: Setup Nix Environment uses: ./.github/actions/setup-nix with: + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' cache-id: common tools: style withTools memory tests release postgrestPackage @@ -38,6 +39,7 @@ jobs: - name: Setup Nix Environment uses: ./.github/actions/setup-nix with: + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' tools: style cache-id: common - name: Run linter (check locally with `nix-shell --run postgrest-lint`) @@ -60,6 +62,7 @@ jobs: - name: Setup Nix Environment uses: ./.github/actions/setup-nix with: + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' tools: tests cache-id: common @@ -97,6 +100,7 @@ jobs: - name: Setup Nix Environment uses: ./.github/actions/setup-nix with: + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' tools: tests withTools cache-id: common @@ -118,6 +122,7 @@ jobs: - name: Setup Nix Environment uses: ./.github/actions/setup-nix with: + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' tools: memory cache-id: common - name: Run memory tests @@ -131,6 +136,8 @@ jobs: - uses: actions/checkout@v4 - name: Setup Nix Environment uses: ./.github/actions/setup-nix + with: + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Build static executable run: nix-build -A postgrestStatic @@ -157,6 +164,8 @@ jobs: - uses: actions/checkout@v4 - name: Setup Nix Environment uses: ./.github/actions/setup-nix + with: + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Build everything run: | @@ -469,6 +478,7 @@ jobs: - name: Setup Nix Environment uses: ./.github/actions/setup-nix with: + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' tools: release - name: Download Docker image uses: actions/download-artifact@v4