magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert tag name in nix flake for OCI images

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-04-17 03:02:01 -04:00 • committed by June
parent 7300103796
commit e95e4b9200
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View file

@ -198,7 +198,7 @@ jobs:
- name: Build oci-image-x86_64-unknown-linux-gnu - name: Build oci-image-x86_64-unknown-linux-gnu
run: | 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 cp -v -f result oci-image-amd64.tar.gz
- name: Upload artifact oci-image-x86_64-unknown-linux-gnu - 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 - name: Build oci-image-x86_64-unknown-linux-gnu-jemalloc
run: | 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 cp -v -f result oci-image-amd64.tar.gz
- name: Upload artifact oci-image-x86_64-unknown-linux-gnu-jemalloc - 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 - name: Build oci-image-x86_64-unknown-linux-gnu-hmalloc
run: | 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 cp -v -f result oci-image-amd64.tar.gz
- name: Upload artifact oci-image-x86_64-unknown-linux-gnu-hmalloc - name: Upload artifact oci-image-x86_64-unknown-linux-gnu-hmalloc
@ -241,7 +241,7 @@ jobs:
- name: Build oci-image-aarch64-unknown-linux-musl - name: Build oci-image-aarch64-unknown-linux-musl
run: | 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 cp -v -f result oci-image-arm64v8.tar.gz
- name: Upload artifact oci-image-aarch64-unknown-linux-musl - name: Upload artifact oci-image-aarch64-unknown-linux-musl
@ -255,7 +255,7 @@ jobs:
- name: Build oci-image-aarch64-unknown-linux-musl-jemalloc - name: Build oci-image-aarch64-unknown-linux-musl-jemalloc
run: | 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 cp -v -f result oci-image-arm64v8.tar.gz
- name: Upload artifact oci-image-aarch64-unknown-linux-musl-jemalloc - name: Upload artifact oci-image-aarch64-unknown-linux-musl-jemalloc
@ -269,7 +269,7 @@ jobs:
- name: Build oci-image-aarch64-unknown-linux-musl-hmalloc - name: Build oci-image-aarch64-unknown-linux-musl-hmalloc
run: | 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 cp -v -f result oci-image-arm64v8.tar.gz
- name: Upload artifact oci-image-aarch64-unknown-linux-musl-hmalloc - name: Upload artifact oci-image-aarch64-unknown-linux-musl-hmalloc

4
flake.nix
View file

@ -193,10 +193,10 @@
meta.mainProgram = cargoToml.package.name; meta.mainProgram = cargoToml.package.name;
}; };
mkOciImage = pkgs: package: allocator: tag: mkOciImage = pkgs: package: allocator:
pkgs.dockerTools.buildLayeredImage { pkgs.dockerTools.buildLayeredImage {
name = package.pname; name = package.pname;
tag = "${tag}"; tag = "main";
# Debian makes builds reproducible through using the HEAD commit's date # Debian makes builds reproducible through using the HEAD commit's date
created = "@${toString self.lastModified}"; created = "@${toString self.lastModified}";
contents = [ contents = [