diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a30fbea..86ed3c5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,6 @@ on: branches: - main - dev - # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -26,10 +25,9 @@ permissions: contents: read jobs: - tests: - name: CI and Tests + setup: + name: Setup Environment runs-on: ubuntu-latest - steps: - name: Sync repository uses: actions/checkout@v4 @@ -38,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 @@ -65,6 +62,7 @@ jobs: - name: Configure `nix-direnv` run: | echo 'source $HOME/.nix-profile/share/nix-direnv/direnvrc' > "$HOME/.direnvrc" + direnv allow - name: Install `direnv` and `nix-direnv` run: nix-env -f "" -iA direnv -iA nix-direnv @@ -95,10 +93,10 @@ jobs: - name: Perform continuous integration run: direnv exec . engage - build-static: - name: Static Artifacts + build_and_package: + needs: setup + name: Build and Package runs-on: ubuntu-latest - needs: tests strategy: max-parallel: 8 matrix: @@ -171,124 +169,46 @@ jobs: - name: Cache x86_64 inputs for devShell run: | ./bin/nix-build-and-cache .#devShells.x86_64-linux.default.inputDerivation - - - name: Build static artifacts + - name: Build static ${{ matrix.target }} run: | ./bin/nix-build-and-cache .#static-${{ matrix.target }} mkdir -p target/release cp -v -f result/bin/conduit target/release direnv exec . cargo deb --no-build --no-strip --output target/debian/${{ matrix.target }}.deb - - name: Upload static artifacts + - name: Upload static ${{ matrix.target }} uses: actions/upload-artifact@v4 with: name: static-${{ matrix.target }} path: result/bin/conduit if-no-files-found: error - - name: Upload static deb artifacts + - name: Upload deb ${{ matrix.target }} uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }}.deb path: target/debian/${{ matrix.target }}.deb if-no-files-found: error - build-oci: - name: OCI Artifacts and Publish - runs-on: ubuntu-latest - needs: tests - strategy: - max-parallel: 8 - matrix: - oci-target: - [ - "x86_64-unknown-linux-musl", - "x86_64-unknown-linux-musl-jemalloc", - "aarch64-unknown-linux-musl", - "aarch64-unknown-linux-musl-jemalloc", - ] - - steps: - - 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: Build OCI for ${{ matrix.target }} run: | - echo "extra-substituters = ${{ env.ATTIC_ENDPOINT }}" >> /etc/nix/nix.conf - echo "extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}" >> /etc/nix/nix.conf + ./bin/nix-build-and-cache .#oci-image-${{ matrix.target }} + cp -v -f result oci-image-${{ matrix.target }}.tar.gz - - 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: Build OCI images - run: | - ./bin/nix-build-and-cache .#oci-image-${{ matrix.oci-target }} - cp -v -f result oci-image-${{ matrix.oci-target }}.tar.gz - - - name: Upload OCI image artifacts + - name: Upload OCI ${{ matrix.target }} uses: actions/upload-artifact@v4 with: - name: oci-image-${{ matrix.oci-target }} - path: oci-image-${{ matrix.oci-target }}.tar.gz + name: oci-image-${{ matrix.target }} + path: oci-image-${{ matrix.target }}.tar.gz if-no-files-found: error # don't compress again compression-level: 0 - create-and-push-manifest: - name: Create and Push Docker Manifest + docker-push: + needs: build_and_package + name: Publish to Docker Registries runs-on: ubuntu-latest - needs: build-oci - if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' + if: github.event_name != 'pull_request' steps: - name: Download OCI Images Artifacts uses: actions/download-artifact@v4