diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 10e497c..c373bbc 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-03-17T12:47:10Z by kres latest. +# Generated on 2024-08-08T12:59:43Z by kres dbf015a. name: default concurrency: @@ -31,7 +31,7 @@ jobs: if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) services: buildkitd: - image: moby/buildkit:v0.12.5 + image: moby/buildkit:v0.15.1 options: --privileged ports: - 1234:1234 @@ -39,12 +39,38 @@ jobs: - /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit - /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml steps: + - name: gather-system-info + id: system-info + uses: kenchan0130/actions-system-info@v1.3.0 + continue-on-error: true + - name: print-system-info + run: | + MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024)) + + OUTPUTS=( + "CPU Core: ${{ steps.system-info.outputs.cpu-core }}" + "CPU Model: ${{ steps.system-info.outputs.cpu-model }}" + "Hostname: ${{ steps.system-info.outputs.hostname }}" + "NodeName: ${NODE_NAME}" + "Kernel release: ${{ steps.system-info.outputs.kernel-release }}" + "Kernel version: ${{ steps.system-info.outputs.kernel-version }}" + "Name: ${{ steps.system-info.outputs.name }}" + "Platform: ${{ steps.system-info.outputs.platform }}" + "Release: ${{ steps.system-info.outputs.release }}" + "Total memory: ${MEMORY_GB} GB" + ) + + for OUTPUT in "${OUTPUTS[@]}";do + echo "${OUTPUT}" + done + continue-on-error: true - name: checkout uses: actions/checkout@v4 - name: Unshallow run: | git fetch --prune --unshallow - name: Set up Docker Buildx + id: setup-buildx uses: docker/setup-buildx-action@v3 with: append: | @@ -53,6 +79,7 @@ jobs: driver: remote endpoint: tcp://127.0.0.1:1234 - name: Build + if: github.event_name == 'pull_request' run: | make - name: Login to registry diff --git a/.kres.yaml b/.kres.yaml index d163913..9f33c68 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -11,7 +11,7 @@ spec: - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs - name: PKGS - defaultValue: v1.7.0-alpha.0-33-g3aacf03 + defaultValue: v1.8.0-alpha.0-46-g124d35b --- kind: common.Build spec: diff --git a/Makefile b/Makefile index 38d5e61..ddb9090 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-03-17T12:47:10Z by kres latest. +# Generated on 2024-08-08T13:00:15Z by kres dbf015a. # common variables @@ -9,12 +9,9 @@ TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*) ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined') BRANCH := $(shell git rev-parse --abbrev-ref HEAD) ARTIFACTS := _out +IMAGE_TAG ?= $(TAG) OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]') -GOARCH := $(shell uname -m | tr '[:upper:]' '[:lower:]') - -ifeq ($(GOARCH),x86_64) - GOARCH := amd64 -endif +GOARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') REGISTRY ?= ghcr.io USERNAME ?= siderolabs REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME) @@ -28,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct) # sync bldr image with pkgfile -BLDR_RELEASE := v0.3.0 +BLDR_RELEASE := v0.3.2 BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE) BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src @@ -50,7 +47,7 @@ COMMON_ARGS += --build-arg=PKGS="$(PKGS)" # extra variables PKGS_PREFIX ?= ghcr.io/siderolabs -PKGS ?= v1.7.0-alpha.0-33-g3aacf03 +PKGS ?= v1.8.0-alpha.0-46-g124d35b # targets defines all the available targets @@ -100,7 +97,7 @@ If you already have a compatible builder instance, you may use that instead. ## Artifacts All artifacts will be output to ./$(ARTIFACTS). Images will be tagged with the -registry "$(REGISTRY)", username "$(USERNAME)", and a dynamic tag (e.g. $(IMAGE):$(TAG)). +registry "$(REGISTRY)", username "$(USERNAME)", and a dynamic tag (e.g. $(IMAGE):$(IMAGE_TAG)). The registry and username can be overridden by exporting REGISTRY, and USERNAME respectively. @@ -108,13 +105,13 @@ endef all: $(TARGETS) ## Builds all targets defined. +$(ARTIFACTS): ## Creates artifacts directory. + @mkdir -p $(ARTIFACTS) + .PHONY: clean clean: ## Cleans up all artifacts. @rm -rf $(ARTIFACTS) -$(ARTIFACTS): ## Creates artifacts directory. - @mkdir -p $(ARTIFACTS) - target-%: ## Builds the specified target defined in the Pkgfile. The build result will only remain in the build cache. @$(BUILD) --target=$* $(COMMON_ARGS) $(TARGET_ARGS) $(CI_ARGS) . @@ -151,8 +148,7 @@ help: ## This help menu. @grep -E '^[a-zA-Z%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' .PHONY: release-notes -release-notes: - mkdir -p $(ARTIFACTS) +release-notes: $(ARTIFACTS) @ARTIFACTS=$(ARTIFACTS) ./hack/release.sh $@ $(ARTIFACTS)/RELEASE_NOTES.md $(TAG) .PHONY: conformance diff --git a/Pkgfile b/Pkgfile index 98b5e54..5785ce6 100644 --- a/Pkgfile +++ b/Pkgfile @@ -1,16 +1,16 @@ -# syntax = ghcr.io/siderolabs/bldr:v0.3.0 +# syntax = ghcr.io/siderolabs/bldr:v0.3.2 format: v1alpha2 vars: - # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=ARM-software/arm-trusted-firmware - arm_trusted_firmware_version: 2.8.0 - arm_trusted_firmware_sha256: 60fad60eeb6840097f8e64f16093c06ddb2ef269c7a22affed02beaa6cefe466 - arm_trusted_firmware_sha512: 958cf8f9e258638e59d0fbd8b053fce7d8a9ea2fc922686c9d20ea16f79f55219ac18a12ab240c528ee98e49c2e0eef4c963fdb255cc14b92437a5b3cffc8640 + # renovate: datasource=github-tags extractVersion=^lts-v(?.*)$ depName=ARM-software/arm-trusted-firmware + arm_trusted_firmware_version: 2.10.4 + arm_trusted_firmware_sha256: ba215404fe9db26e5f2cef3fdce17b7c8ed344a2a1d592dd01a5f1c5e72cfdbd + arm_trusted_firmware_sha512: 0b0e634ba7b1bf3d2a0ef429391f9a6c350abe373b0563e3932f0347246b773238593036674cbb958fffce36c7449f9ebb3ee340650a3184c3e052487fae656b # renovate: datasource=github-tags extractVersion=^v(?.*)$ depName=u-boot/u-boot - uboot_version: 2024.01 - uboot_sha256: b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 - uboot_sha512: 45bd093ba3bda23e43cdde83d8656c1ee1348ac2886ecff1fee475f101ac4965a5be6565408fa5b990c723f3fdc833edfca60a719f735a43040cd14a1b59a88b + uboot_version: 2024.07 + uboot_sha256: f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f + uboot_sha512: 678f44e2b9132140f0bf05c637e57e638c73c278611037a41824b3ebff2131af4dec0163da4664bb2e5c4fd8034ba8c95b93b57f7aa9f4c045da322d87c3b5e9 labels: org.opencontainers.image.source: https://github.com/siderolabs/sbc-allwinner diff --git a/artifacts/arm-trusted-firmware/sun50i_a64/pkg.yaml b/artifacts/arm-trusted-firmware/sun50i_a64/pkg.yaml index 415f860..b64cb97 100644 --- a/artifacts/arm-trusted-firmware/sun50i_a64/pkg.yaml +++ b/artifacts/arm-trusted-firmware/sun50i_a64/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base steps: - sources: - - url: https://github.com/ARM-software/arm-trusted-firmware/archive/v{{ .arm_trusted_firmware_version }}.tar.gz + - url: https://github.com/ARM-software/arm-trusted-firmware/archive/lts-v{{ .arm_trusted_firmware_version }}.tar.gz destination: arm-trusted-firmware.tar.gz sha256: "{{ .arm_trusted_firmware_sha256 }}" sha512: "{{ .arm_trusted_firmware_sha512 }}" diff --git a/artifacts/bananapi_m64/u-boot/pkg.yaml b/artifacts/bananapi_m64/u-boot/pkg.yaml index 4961976..27af204 100644 --- a/artifacts/bananapi_m64/u-boot/pkg.yaml +++ b/artifacts/bananapi_m64/u-boot/pkg.yaml @@ -22,7 +22,7 @@ steps: && ln -sf /toolchain/bin/env /usr/bin/env \ && ln -sf /toolchain/bin/python3 /toolchain/bin/python - pip3 install pyelftools + pip3 install pyelftools setuptools tar xf u-boot.tar.bz2 --strip-components=1 - | diff --git a/artifacts/libretech_all_h3_cc_h5/u-boot/pkg.yaml b/artifacts/libretech_all_h3_cc_h5/u-boot/pkg.yaml index 5d7f237..472fe3b 100644 --- a/artifacts/libretech_all_h3_cc_h5/u-boot/pkg.yaml +++ b/artifacts/libretech_all_h3_cc_h5/u-boot/pkg.yaml @@ -22,7 +22,7 @@ steps: && ln -sf /toolchain/bin/env /usr/bin/env \ && ln -sf /toolchain/bin/python3 /toolchain/bin/python - pip3 install pyelftools + pip3 install pyelftools setuptools tar xf u-boot.tar.bz2 --strip-components=1 - | diff --git a/artifacts/pine64/u-boot/pkg.yaml b/artifacts/pine64/u-boot/pkg.yaml index 63d97fa..79462c5 100644 --- a/artifacts/pine64/u-boot/pkg.yaml +++ b/artifacts/pine64/u-boot/pkg.yaml @@ -22,7 +22,7 @@ steps: && ln -sf /toolchain/bin/env /usr/bin/env \ && ln -sf /toolchain/bin/python3 /toolchain/bin/python - pip3 install pyelftools + pip3 install pyelftools setuptools tar xf u-boot.tar.bz2 --strip-components=1 - | diff --git a/go.work b/go.work index 80ff65b..3d9b120 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.1 +go 1.22.6 use ( ./installers/bananapi_m64/src diff --git a/installers/bananapi_m64/src/go.mod b/installers/bananapi_m64/src/go.mod index a26f874..1c3ba23 100644 --- a/installers/bananapi_m64/src/go.mod +++ b/installers/bananapi_m64/src/go.mod @@ -1,11 +1,11 @@ module bananapi_m64 -go 1.22.1 +go 1.22.6 require ( github.com/siderolabs/go-copy v0.1.0 - github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1 - golang.org/x/sys v0.18.0 + github.com/siderolabs/talos/pkg/machinery v1.7.6 + golang.org/x/sys v0.23.0 ) require gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/installers/bananapi_m64/src/go.sum b/installers/bananapi_m64/src/go.sum index 4e79109..107f24b 100644 --- a/installers/bananapi_m64/src/go.sum +++ b/installers/bananapi_m64/src/go.sum @@ -1,9 +1,9 @@ github.com/siderolabs/go-copy v0.1.0 h1:OIWCtSg+rhOtnIZTpT31Gfpn17rv5kwJqQHG+QUEgC8= github.com/siderolabs/go-copy v0.1.0/go.mod h1:4bF2rZOZAR/ags/U4AVSpjFE5RPGdEeSkOq6yR9YOkU= -github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1 h1:0pURmnbzsu19reku8OjN1DkeAxgkmuxmKgDgbFT3228= -github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1/go.mod h1:H2+5QeGXYi2Q7RhBNUAD6dhc9LmdJ2AUXtiAWRXtWBc= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +github.com/siderolabs/talos/pkg/machinery v1.7.6 h1:+tONHv8JuW46/mTWNgDAUkdfYvWBZ/Ai1mlK1SSQzZU= +github.com/siderolabs/talos/pkg/machinery v1.7.6/go.mod h1:8H8geXAcGN0DvMOL70p4sC5gZUCxdoZmtLbuoKigFZI= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/installers/libretech_all_h3_cc_h5/src/go.mod b/installers/libretech_all_h3_cc_h5/src/go.mod index 639cb44..1a836bf 100644 --- a/installers/libretech_all_h3_cc_h5/src/go.mod +++ b/installers/libretech_all_h3_cc_h5/src/go.mod @@ -1,11 +1,11 @@ module libretech_all_h3_cc_h5 -go 1.22.1 +go 1.22.6 require ( github.com/siderolabs/go-copy v0.1.0 - github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1 - golang.org/x/sys v0.18.0 + github.com/siderolabs/talos/pkg/machinery v1.7.6 + golang.org/x/sys v0.23.0 ) require gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/installers/libretech_all_h3_cc_h5/src/go.sum b/installers/libretech_all_h3_cc_h5/src/go.sum index 4e79109..107f24b 100644 --- a/installers/libretech_all_h3_cc_h5/src/go.sum +++ b/installers/libretech_all_h3_cc_h5/src/go.sum @@ -1,9 +1,9 @@ github.com/siderolabs/go-copy v0.1.0 h1:OIWCtSg+rhOtnIZTpT31Gfpn17rv5kwJqQHG+QUEgC8= github.com/siderolabs/go-copy v0.1.0/go.mod h1:4bF2rZOZAR/ags/U4AVSpjFE5RPGdEeSkOq6yR9YOkU= -github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1 h1:0pURmnbzsu19reku8OjN1DkeAxgkmuxmKgDgbFT3228= -github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1/go.mod h1:H2+5QeGXYi2Q7RhBNUAD6dhc9LmdJ2AUXtiAWRXtWBc= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +github.com/siderolabs/talos/pkg/machinery v1.7.6 h1:+tONHv8JuW46/mTWNgDAUkdfYvWBZ/Ai1mlK1SSQzZU= +github.com/siderolabs/talos/pkg/machinery v1.7.6/go.mod h1:8H8geXAcGN0DvMOL70p4sC5gZUCxdoZmtLbuoKigFZI= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/installers/pine64/src/go.mod b/installers/pine64/src/go.mod index 6b614f6..3bcf3ac 100644 --- a/installers/pine64/src/go.mod +++ b/installers/pine64/src/go.mod @@ -1,11 +1,11 @@ module pine64 -go 1.22.1 +go 1.22.6 require ( github.com/siderolabs/go-copy v0.1.0 - github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1 - golang.org/x/sys v0.18.0 + github.com/siderolabs/talos/pkg/machinery v1.7.6 + golang.org/x/sys v0.23.0 ) require gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/installers/pine64/src/go.sum b/installers/pine64/src/go.sum index 4e79109..107f24b 100644 --- a/installers/pine64/src/go.sum +++ b/installers/pine64/src/go.sum @@ -1,9 +1,9 @@ github.com/siderolabs/go-copy v0.1.0 h1:OIWCtSg+rhOtnIZTpT31Gfpn17rv5kwJqQHG+QUEgC8= github.com/siderolabs/go-copy v0.1.0/go.mod h1:4bF2rZOZAR/ags/U4AVSpjFE5RPGdEeSkOq6yR9YOkU= -github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1 h1:0pURmnbzsu19reku8OjN1DkeAxgkmuxmKgDgbFT3228= -github.com/siderolabs/talos/pkg/machinery v1.7.0-alpha.1/go.mod h1:H2+5QeGXYi2Q7RhBNUAD6dhc9LmdJ2AUXtiAWRXtWBc= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +github.com/siderolabs/talos/pkg/machinery v1.7.6 h1:+tONHv8JuW46/mTWNgDAUkdfYvWBZ/Ai1mlK1SSQzZU= +github.com/siderolabs/talos/pkg/machinery v1.7.6/go.mod h1:8H8geXAcGN0DvMOL70p4sC5gZUCxdoZmtLbuoKigFZI= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=