diff --git a/.github/workflows/ci-nix.yaml b/.github/workflows/ci-nix.yaml index 499a2e4aa00..be7496d6242 100644 --- a/.github/workflows/ci-nix.yaml +++ b/.github/workflows/ci-nix.yaml @@ -138,6 +138,9 @@ jobs: benchmarks: name: "Benchmarks" runs-on: ubuntu-latest + permissions: + contents: read + id-token: write strategy: matrix: include: @@ -170,6 +173,11 @@ jobs: name: cardano-scaling authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}' + - name: ❄ Magic nix + uses: DeterminateSystems/magic-nix-cache-action@main + with: + source-url: https://github.com/locallycompact/magic-nix-cache + - name: 📈 Benchmark run: | mkdir -p benchmarks @@ -232,6 +240,10 @@ jobs: nix-flake-check: name: "nix flake check" runs-on: ubuntu-latest + permissions: + contents: read + id-token: write + steps: - name: 📥 Checkout repository uses: actions/checkout@v4 @@ -243,20 +255,27 @@ jobs: accept-flake-config = true log-lines = 1000 - - name: ❄ Cachix cache of nix derivations - uses: cachix/cachix-action@v15 + - name: ❄ Magic nix + uses: DeterminateSystems/magic-nix-cache-action@main with: - name: cardano-scaling - authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}' + source-url: https://github.com/locallycompact/magic-nix-cache + + - run: cat ~/.config/nix/nix.conf + + - run: cat /etc/nix/nix.conf - name: ❄ Nix Flake Check run: | - nix flake check -L + nix flake check -L build-specification: name: "Build specification using nix" runs-on: ubuntu-latest + permissions: + contents: read + id-token: write + steps: - name: 📥 Checkout repository uses: actions/checkout@v4 @@ -274,6 +293,11 @@ jobs: name: cardano-scaling authToken: '${{ secrets.CACHIX_CARDANO_SCALING_AUTH_TOKEN }}' + - name: ❄ Magic nix + uses: DeterminateSystems/magic-nix-cache-action@main + with: + source-url: https://github.com/locallycompact/magic-nix-cache + - name: ❄ Build specification PDF run: | nix build .#spec && cp result/*.pdf spec/ diff --git a/README.md b/README.md index f448c1ff38d..4c8cd30be97 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ #

Hydra :dragon_face:

+

Implementation of the Hydra scalability protocols.

diff --git a/flake.nix b/flake.nix index f797d58d92c..36a575f3006 100644 --- a/flake.nix +++ b/flake.nix @@ -173,17 +173,4 @@ }; }; - nixConfig = { - extra-substituters = [ - "https://cache.iog.io" - "https://hydra-node.cachix.org" - "https://cardano-scaling.cachix.org" - ]; - extra-trusted-public-keys = [ - "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" - "hydra-node.cachix.org-1:vK4mOEQDQKl9FTbq76NjOuNaRD4pZLxi1yri31HHmIw=" - "cardano-scaling.cachix.org-1:RKvHKhGs/b6CBDqzKbDk0Rv6sod2kPSXLwPzcUQg9lY=" - ]; - allow-import-from-derivation = true; - }; }