diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51ec195b..9f2cc992 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -198,7 +198,7 @@ jobs: - name: Build oci-image-x86_64-unknown-linux-gnu run: | - ./bin/nix-build-and-cache .#oci-image "${{ github.ref_name }}" + ./bin/nix-build-and-cache .#oci-image cp -v -f result oci-image-amd64.tar.gz - name: Upload artifact oci-image-x86_64-unknown-linux-gnu @@ -212,7 +212,7 @@ jobs: - name: Build oci-image-x86_64-unknown-linux-gnu-jemalloc run: | - ./bin/nix-build-and-cache .#oci-image-jemalloc "${{ github.ref_name }}" + ./bin/nix-build-and-cache .#oci-image-jemalloc cp -v -f result oci-image-amd64.tar.gz - name: Upload artifact oci-image-x86_64-unknown-linux-gnu-jemalloc @@ -226,7 +226,7 @@ jobs: - name: Build oci-image-x86_64-unknown-linux-gnu-hmalloc run: | - ./bin/nix-build-and-cache .#oci-image-hmalloc "${{ github.ref_name }}" + ./bin/nix-build-and-cache .#oci-image-hmalloc cp -v -f result oci-image-amd64.tar.gz - name: Upload artifact oci-image-x86_64-unknown-linux-gnu-hmalloc @@ -241,7 +241,7 @@ jobs: - name: Build oci-image-aarch64-unknown-linux-musl run: | - ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl "${{ github.ref_name }}" + ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl cp -v -f result oci-image-arm64v8.tar.gz - name: Upload artifact oci-image-aarch64-unknown-linux-musl @@ -255,7 +255,7 @@ jobs: - name: Build oci-image-aarch64-unknown-linux-musl-jemalloc run: | - ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl-jemalloc "${{ github.ref_name }}" + ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl-jemalloc cp -v -f result oci-image-arm64v8.tar.gz - name: Upload artifact oci-image-aarch64-unknown-linux-musl-jemalloc @@ -269,7 +269,7 @@ jobs: - name: Build oci-image-aarch64-unknown-linux-musl-hmalloc run: | - ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl-hmalloc "${{ github.ref_name }}" + ./bin/nix-build-and-cache .#oci-image-aarch64-unknown-linux-musl-hmalloc cp -v -f result oci-image-arm64v8.tar.gz - name: Upload artifact oci-image-aarch64-unknown-linux-musl-hmalloc diff --git a/flake.nix b/flake.nix index 5ef2c00f..19d5eeee 100644 --- a/flake.nix +++ b/flake.nix @@ -193,10 +193,10 @@ meta.mainProgram = cargoToml.package.name; }; - mkOciImage = pkgs: package: allocator: tag: + mkOciImage = pkgs: package: allocator: pkgs.dockerTools.buildLayeredImage { name = package.pname; - tag = "${tag}"; + tag = "main"; # Debian makes builds reproducible through using the HEAD commit's date created = "@${toString self.lastModified}"; contents = [