diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24f759dc..9a9737b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,6 @@ jobs: uses: cachix/install-nix-action@v26 with: nix_path: nixpkgs=channel:nixos-unstable - # Add `nix-community`, Crane, upstream Conduit, and conduwuit binary caches extra_nix_config: | experimental-features = nix-command flakes extra-substituters = https://nix-community.cachix.org @@ -56,41 +55,22 @@ jobs: echo "extra-substituters = ${{ env.ATTIC_ENDPOINT }}" >> /etc/nix/nix.conf echo "extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}" >> /etc/nix/nix.conf - - name: Pop/push Magic Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@main - - - name: Configure `nix-direnv` - run: | - echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc" - - name: Install `direnv` and `nix-direnv` run: nix-env -f "" -iA direnv -iA nix-direnv - - name: Pop/push downloaded crate cache - uses: actions/cache@v4 - with: - key: downloaded-crates - path: ~/.cargo - - - name: Pop/push compiled crate cache - uses: actions/cache@v4 - with: - key: compiled-crates-${{runner.os}} - path: target - - # Do this to shorten the logs for the real CI step - name: Populate `/nix/store` run: nix develop --command true - - name: Allow direnv - run: direnv allow - - - name: Cache x86_64 inputs for devShell - run: | - ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation - - - name: Perform continuous integration - run: direnv exec . engage + # Store the build environment in an artifact + - name: Cache build environment + uses: actions/upload-artifact@v4 + with: + name: build-environment + path: | + /nix/store + ~/.cargo + $HOME/.direnvrc + /etc/nix/nix.conf build_and_package: needs: setup @@ -108,66 +88,23 @@ jobs: ] steps: + - name: Download Build Environment + uses: actions/download-artifact@v4 + with: + name: build-environment + - name: Sync repository uses: actions/checkout@v4 - - name: Install Nix (with flakes and nix-command enabled) - uses: cachix/install-nix-action@v26 - with: - nix_path: nixpkgs=channel:nixos-unstable - - # Add `nix-community`, Crane, upstream Conduit, and conduwuit binary caches - extra_nix_config: | - experimental-features = nix-command flakes - extra-substituters = https://nix-community.cachix.org - extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= - extra-substituters = https://crane.cachix.org - extra-trusted-public-keys = crane.cachix.org-1:8Scfpmn9w+hGdXH/Q9tTLiYAE/2dnJYRJP7kl80GuRk= - extra-substituters = https://nix.computer.surgery/conduit - extra-trusted-public-keys = conduit:ZGAf6P6LhNvnoJJ3Me3PRg7tlLSrPxcQ2RiE5LIppjo= - extra-substituters = https://attic.kennel.juneis.dog/conduit - extra-trusted-public-keys = conduit:Isq8FGyEC6FOXH6nD+BOeAA+bKp6X6UIbupSlGEPuOg= - extra-substituters = https://attic.kennel.juneis.dog/conduwuit - extra-trusted-public-keys = conduwuit:lYPVh7o1hLu1idH4Xt2QHaRa49WRGSAqzcfFd94aOTw= - - - name: Add alternative Nix binary caches if specified - if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }} + - name: Reuse Build Environment run: | - echo "extra-substituters = ${{ env.ATTIC_ENDPOINT }}" >> /etc/nix/nix.conf - echo "extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}" >> /etc/nix/nix.conf - - - name: Pop/push Magic Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@main - - - name: Configure `nix-direnv` - run: | - echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc" - - - name: Install `direnv` and `nix-direnv` - run: nix-env -f "" -iA direnv -iA nix-direnv - - - name: Pop/push downloaded crate cache - uses: actions/cache@v4 - with: - key: downloaded-crates - path: ~/.cargo - - - name: Pop/push compiled crate cache - uses: actions/cache@v4 - with: - key: compiled-crates-${{runner.os}} - path: target - - # Do this to shorten the logs for the real CI step - - name: Populate `/nix/store` - run: nix develop --command true - - - name: Allow direnv - run: direnv allow - - - name: Cache x86_64 inputs for devShell - run: | - ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation + # Ensure the nix configuration is correct + sudo cp -R /etc/nix/nix.conf /etc/nix/nix.conf.bak + sudo cp -R nix.conf /etc/nix/nix.conf + # Source direnv + source $HOME/.direnvrc + direnv allow + - name: Build static ${{ matrix.target }} run: | ./bin/nix-build-and-cache .#static-${{ matrix.target }}