diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cb8e42a2..f33d76df 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-10-17T14:48:14Z by kres 34e72ac. +# Generated on 2024-11-11T15:36:12Z by kres b6443eb. name: default concurrency: @@ -33,7 +33,7 @@ jobs: labels: ${{ steps.retrieve-pr-labels.outputs.result }} services: buildkitd: - image: moby/buildkit:v0.16.0 + image: moby/buildkit:v0.17.1 options: --privileged ports: - 1234:1234 @@ -137,7 +137,7 @@ jobs: - default services: buildkitd: - image: moby/buildkit:v0.16.0 + image: moby/buildkit:v0.17.1 options: --privileged ports: - 1234:1234 diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index 41a92589..08076ee1 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-10-17T14:48:14Z by kres 34e72ac. +# Generated on 2024-11-11T15:36:12Z by kres b6443eb. name: weekly concurrency: @@ -16,7 +16,7 @@ jobs: - pkgs services: buildkitd: - image: moby/buildkit:v0.16.0 + image: moby/buildkit:v0.17.1 options: --privileged ports: - 1234:1234 diff --git a/Makefile b/Makefile index af31e6d3..5462e949 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-11-04T06:45:55Z by kres dd14759. +# Generated on 2024-11-11T15:36:12Z by kres b6443eb. # common variables @@ -41,6 +41,7 @@ COMMON_ARGS += --provenance=false COMMON_ARGS += --progress=$(PROGRESS) COMMON_ARGS += --platform=$(PLATFORM) COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) +COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=1 # targets defines all the available targets @@ -153,6 +154,15 @@ target-%: ## Builds the specified target defined in the Pkgfile. The build resu local-%: ## Builds the specified target defined in the Pkgfile using the local output type. The build result will be output to the specified local destination. @$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)" + @PLATFORM=$(PLATFORM) ARTIFACTS=$(ARTIFACTS) bash -c '\ + for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \ + echo $$platform; \ + directory="$${platform//\//_}"; \ + if [[ -d "$$ARTIFACTS/$$directory" ]]; then \ + mv "$$ARTIFACTS/$$directory/"* $$ARTIFACTS; \ + rmdir "$$ARTIFACTS/$$directory/"; \ + fi; \ + done' docker-%: ## Builds the specified target defined in the Pkgfile using the docker output type. The build result will be loaded into Docker. @$(MAKE) target-$* TARGET_ARGS="$(TARGET_ARGS)" diff --git a/Pkgfile b/Pkgfile index 61a0ef45..358f6f93 100644 --- a/Pkgfile +++ b/Pkgfile @@ -3,7 +3,7 @@ format: v1alpha2 vars: - TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.9.0-alpha.0-7-g3750064 + TOOLS_IMAGE: ghcr.io/siderolabs/tools:v1.9.0-alpha.0-9-ge061b6f # renovate: datasource=github-releases depName=containernetworking/plugins cni_version: v1.6.0 @@ -58,9 +58,9 @@ vars: ipmitool_sha512: 2d91706e9feba4b2ce4808eca087b81b842c4292a5840830001919c06ec8babd8f8761b74bb9dcf8fbc7765f028a5b1a192a3c1b643f2adaa157fed6fb0d1ee3 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.netfilter.org/iptables - iptables_version: 1.8.10 - iptables_sha256: 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c - iptables_sha512: 71e6ed2260859157d61981a4fe5039dc9e8d7da885a626a4b5dae8164c509a9d9f874286b9468bb6a462d6e259d4d32d5967777ecefdd8a293011ae80c00f153 + iptables_version: 1.8.11 + iptables_sha256: d87303d55ef8c92bcad4dd3f978b26d272013642b029425775f5bad1009fe7b2 + iptables_sha512: 4937020bf52d57a45b76e1eba125214a2f4531de52ff1d15185faeef8bea0cd90eb77f99f81baa573944aa122f350a7198cef41d70594e1b65514784addbcc40 # renovate: datasource=git-refs versioning=git depName=https://github.com/ipxe/ipxe.git ipxe_ref: 8fc11d8a4ad41f15af3d081250865f971312d871