From 5f3da4af68cc0a0d50d8705cb32c92f88c687ce5 Mon Sep 17 00:00:00 2001 From: Tom Foster Date: Tue, 23 Apr 2024 21:27:47 +0100 Subject: [PATCH] Rename and reorganise builds --- .github/workflows/ci.yml | 103 ++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ee67154..317c3595 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,25 +72,10 @@ jobs: run: | direnv exec . engage - - name: Build static targets - run: > - bin/nix-build-and-cache - .#static-x86_64-unknown-linux-musl - .#static-x86_64-unknown-linux-musl-jemalloc - .#static-aarch64-unknown-linux-musl - .#static-aarch64-unknown-linux-musl-jemalloc - - - name: Organise and prepare static outputs + - name: Build x86_64 static with hmalloc run: | - mkdir -p target/release target/debian - sudo mv result/bin/conduit target/release/static-x86_64-unknown-linux-musl + bin/nix-build-and-cache -A static-x86_64-unknown-linux-musl --out-link target/release/static-x86_64-unknown-linux-musl direnv exec . cargo deb --no-build --no-strip --output target/debian/x86_64-unknown-linux-musl.deb - sudo mv result-1/bin/conduit target/release/static-x86_64-unknown-linux-musl-jemalloc - direnv exec . cargo deb --no-build --no-strip --output target/debian/x86_64-unknown-linux-musl-jemalloc.deb - sudo mv result-2/bin/conduit target/release/static-aarch64-unknown-linux-musl - direnv exec . cargo deb --no-build --no-strip --output target/debian/aarch64-unknown-linux-musl.deb - sudo mv result-3/bin/conduit target/release/static-aarch64-unknown-linux-musl-jemalloc - direnv exec . cargo deb --no-build --no-strip --output target/debian/aarch64-unknown-linux-musl-jemalloc.deb - name: Upload static-x86_64-unknown-linux-musl uses: actions/upload-artifact@v4 @@ -99,27 +84,6 @@ jobs: path: target/release/static-x86_64-unknown-linux-musl if-no-files-found: error - - name: Upload static-x86_64-unknown-linux-musl-jemalloc - uses: actions/upload-artifact@v4 - with: - name: static-x86_64-unknown-linux-musl-jemalloc - path: target/release/static-x86_64-unknown-linux-musl-jemalloc - if-no-files-found: error - - - name: Upload static-aarch64-unknown-linux-musl - uses: actions/upload-artifact@v4 - with: - name: static-aarch64-unknown-linux-musl - path: target/release/static-aarch64-unknown-linux-musl - if-no-files-found: error - - - name: Upload static-aarch64-unknown-linux-musl-jemalloc - uses: actions/upload-artifact@v4 - with: - name: static-aarch64-unknown-linux-musl-jemalloc - path: target/release/static-aarch64-unknown-linux-musl-jemalloc - if-no-files-found: error - - name: Upload deb x86_64-unknown-linux-musl uses: actions/upload-artifact@v4 with: @@ -127,6 +91,18 @@ jobs: path: target/debian/x86_64-unknown-linux-musl.deb if-no-files-found: error + - name: Build x86_64 static with jemalloc + run: | + bin/nix-build-and-cache -A static-x86_64-unknown-linux-musl-jemalloc --out-link target/release/static-x86_64-unknown-linux-musl-jemalloc + direnv exec . cargo deb --no-build --no-strip --output target/debian/x86_64-unknown-linux-musl-jemalloc.deb + + - name: Upload static-x86_64-unknown-linux-musl-jemalloc + uses: actions/upload-artifact@v4 + with: + name: static-x86_64-unknown-linux-musl-jemalloc + path: target/release/static-x86_64-unknown-linux-musl-jemalloc + if-no-files-found: error + - name: Upload deb x86_64-unknown-linux-musl-jemalloc uses: actions/upload-artifact@v4 with: @@ -134,6 +110,26 @@ jobs: path: target/debian/x86_64-unknown-linux-musl-jemalloc.deb if-no-files-found: error + - name: Build x86_64 OCI with hmalloc + run: | + bin/nix-build-and-cache -A oci-image-x86_64-unknown-linux-musl --out-link oci-image-x86_64-unknown-linux-musl.tar.gz + + - name: Build x86_64 OCI with jemalloc + run: | + bin/nix-build-and-cache -A oci-image-x86_64-unknown-linux-musl-jemalloc --out-link oci-image-x86_64-unknown-linux-musl-jemalloc.tar.gz + + - name: Build aarch64 static with hmalloc + run: | + bin/nix-build-and-cache -A static-aarch64-unknown-linux-musl --out-link target/release/static-aarch64-unknown-linux-musl + direnv exec . cargo deb --no-build --no-strip --output target/debian/aarch64-unknown-linux-musl.deb + + - name: Upload static-aarch64-unknown-linux-musl + uses: actions/upload-artifact@v4 + with: + name: static-aarch64-unknown-linux-musl + path: target/release/static-aarch64-unknown-linux-musl + if-no-files-found: error + - name: Upload deb aarch64-unknown-linux-musl uses: actions/upload-artifact@v4 with: @@ -141,6 +137,18 @@ jobs: path: target/debian/aarch64-unknown-linux-musl.deb if-no-files-found: error + - name: Build aarch64 static with jemalloc + run: | + bin/nix-build-and-cache -A static-aarch64-unknown-linux-musl-jemalloc --out-link target/release/static-aarch64-unknown-linux-musl-jemalloc + direnv exec . cargo deb --no-build --no-strip --output target/debian/aarch64-unknown-linux-musl-jemalloc.deb + + - name: Upload static-aarch64-unknown-linux-musl-jemalloc + uses: actions/upload-artifact@v4 + with: + name: static-aarch64-unknown-linux-musl-jemalloc + path: target/release/static-aarch64-unknown-linux-musl-jemalloc + if-no-files-found: error + - name: Upload deb aarch64-unknown-linux-musl-jemalloc uses: actions/upload-artifact@v4 with: @@ -148,20 +156,13 @@ jobs: path: target/debian/aarch64-unknown-linux-musl-jemalloc.deb if-no-files-found: error - - name: Build OCI image targets - run: > - bin/nix-build-and-cache - .#oci-image-x86_64-unknown-linux-musl - .#oci-image-x86_64-unknown-linux-musl-jemalloc - .#oci-image-aarch64-unknown-linux-musl - .#oci-image-aarch64-unknown-linux-musl-jemalloc - - - name: Organise OCI image outputs + - name: Build aarch64 OCI with hmalloc run: | - mv result oci-image-x86_64-unknown-linux-musl.tar.gz - mv result-1 oci-image-x86_64-unknown-linux-musl-jemalloc.tar.gz - mv result-2 oci-image-aarch64-unknown-linux-musl.tar.gz - mv result-3 oci-image-aarch64-unknown-linux-musl-jemalloc.tar.gz + bin/nix-build-and-cache -A oci-image-aarch64-unknown-linux-musl --out-link oci-image-aarch64-unknown-linux-musl.tar.gz + + - name: Build aarch64 OCI with jemalloc + run: | + bin/nix-build-and-cache -A oci-image-aarch64-unknown-linux-musl-jemalloc --out-link oci-image-aarch64-unknown-linux-musl-jemalloc.tar.gz - name: Upload OCI image x86_64-unknown-linux-musl uses: actions/upload-artifact@v4