Skip to content
This repository was archived by the owner on Apr 11, 2025. It is now read-only.

Commit 0efb05f

Browse files
smirasmira
committed
feat: update Go to 1.22.4
Via pkgs update. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 01ad9f5 commit 0efb05f

File tree

4 files changed

+94
-20
lines changed

4 files changed

+94
-20
lines changed

Diff for: ‎.github/workflows/ci.yaml

+55-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-04-01T15:12:00Z by kres latest.
3+
# Generated on 2024-06-05T12:39:45Z by kres f292767.
44

55
name: default
66
concurrency:
@@ -33,20 +33,46 @@ jobs:
3333
labels: ${{ steps.retrieve-pr-labels.outputs.result }}
3434
services:
3535
buildkitd:
36-
image: moby/buildkit:v0.13.1
36+
image: moby/buildkit:v0.13.2
3737
options: --privileged
3838
ports:
3939
- 1234:1234
4040
volumes:
4141
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
4242
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
4343
steps:
44+
- name: gather-system-info
45+
id: system-info
46+
uses: kenchan0130/[email protected]
47+
continue-on-error: true
48+
- name: print-system-info
49+
run: |
50+
MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024))
51+
52+
OUTPUTS=(
53+
"CPU Core: ${{ steps.system-info.outputs.cpu-core }}"
54+
"CPU Model: ${{ steps.system-info.outputs.cpu-model }}"
55+
"Hostname: ${{ steps.system-info.outputs.hostname }}"
56+
"NodeName: ${NODE_NAME}"
57+
"Kernel release: ${{ steps.system-info.outputs.kernel-release }}"
58+
"Kernel version: ${{ steps.system-info.outputs.kernel-version }}"
59+
"Name: ${{ steps.system-info.outputs.name }}"
60+
"Platform: ${{ steps.system-info.outputs.platform }}"
61+
"Release: ${{ steps.system-info.outputs.release }}"
62+
"Total memory: ${MEMORY_GB} GB"
63+
)
64+
65+
for OUTPUT in "${OUTPUTS[@]}";do
66+
echo "${OUTPUT}"
67+
done
68+
continue-on-error: true
4469
- name: checkout
4570
uses: actions/checkout@v4
4671
- name: Unshallow
4772
run: |
4873
git fetch --prune --unshallow
4974
- name: Set up Docker Buildx
75+
id: setup-buildx
5076
uses: docker/setup-buildx-action@v3
5177
with:
5278
append: |
@@ -102,20 +128,46 @@ jobs:
102128
- default
103129
services:
104130
buildkitd:
105-
image: moby/buildkit:v0.13.1
131+
image: moby/buildkit:v0.13.2
106132
options: --privileged
107133
ports:
108134
- 1234:1234
109135
volumes:
110136
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
111137
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
112138
steps:
139+
- name: gather-system-info
140+
id: system-info
141+
uses: kenchan0130/[email protected]
142+
continue-on-error: true
143+
- name: print-system-info
144+
run: |
145+
MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024))
146+
147+
OUTPUTS=(
148+
"CPU Core: ${{ steps.system-info.outputs.cpu-core }}"
149+
"CPU Model: ${{ steps.system-info.outputs.cpu-model }}"
150+
"Hostname: ${{ steps.system-info.outputs.hostname }}"
151+
"NodeName: ${NODE_NAME}"
152+
"Kernel release: ${{ steps.system-info.outputs.kernel-release }}"
153+
"Kernel version: ${{ steps.system-info.outputs.kernel-version }}"
154+
"Name: ${{ steps.system-info.outputs.name }}"
155+
"Platform: ${{ steps.system-info.outputs.platform }}"
156+
"Release: ${{ steps.system-info.outputs.release }}"
157+
"Total memory: ${MEMORY_GB} GB"
158+
)
159+
160+
for OUTPUT in "${OUTPUTS[@]}";do
161+
echo "${OUTPUT}"
162+
done
163+
continue-on-error: true
113164
- name: checkout
114165
uses: actions/checkout@v4
115166
- name: Unshallow
116167
run: |
117168
git fetch --prune --unshallow
118169
- name: Set up Docker Buildx
170+
id: setup-buildx
119171
uses: docker/setup-buildx-action@v3
120172
with:
121173
append: |

Diff for: ‎.github/workflows/weekly.yaml

+28-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-04-01T15:12:00Z by kres latest.
3+
# Generated on 2024-06-05T12:39:45Z by kres f292767.
44

55
name: weekly
66
concurrency:
@@ -16,20 +16,46 @@ jobs:
1616
- pkgs
1717
services:
1818
buildkitd:
19-
image: moby/buildkit:v0.13.1
19+
image: moby/buildkit:v0.13.2
2020
options: --privileged
2121
ports:
2222
- 1234:1234
2323
volumes:
2424
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
2525
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
2626
steps:
27+
- name: gather-system-info
28+
id: system-info
29+
uses: kenchan0130/[email protected]
30+
continue-on-error: true
31+
- name: print-system-info
32+
run: |
33+
MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024))
34+
35+
OUTPUTS=(
36+
"CPU Core: ${{ steps.system-info.outputs.cpu-core }}"
37+
"CPU Model: ${{ steps.system-info.outputs.cpu-model }}"
38+
"Hostname: ${{ steps.system-info.outputs.hostname }}"
39+
"NodeName: ${NODE_NAME}"
40+
"Kernel release: ${{ steps.system-info.outputs.kernel-release }}"
41+
"Kernel version: ${{ steps.system-info.outputs.kernel-version }}"
42+
"Name: ${{ steps.system-info.outputs.name }}"
43+
"Platform: ${{ steps.system-info.outputs.platform }}"
44+
"Release: ${{ steps.system-info.outputs.release }}"
45+
"Total memory: ${MEMORY_GB} GB"
46+
)
47+
48+
for OUTPUT in "${OUTPUTS[@]}";do
49+
echo "${OUTPUT}"
50+
done
51+
continue-on-error: true
2752
- name: checkout
2853
uses: actions/checkout@v4
2954
- name: Unshallow
3055
run: |
3156
git fetch --prune --unshallow
3257
- name: Set up Docker Buildx
58+
id: setup-buildx
3359
uses: docker/setup-buildx-action@v3
3460
with:
3561
append: |

Diff for: ‎Makefile

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2024-03-14T10:25:50Z by kres latest.
3+
# Generated on 2024-06-05T12:39:45Z by kres f292767.
44

55
# common variables
66

@@ -9,12 +9,9 @@ TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*)
99
ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined')
1010
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
1111
ARTIFACTS := _out
12+
IMAGE_TAG ?= $(TAG)
1213
OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]')
13-
GOARCH := $(shell uname -m | tr '[:upper:]' '[:lower:]')
14-
15-
ifeq ($(GOARCH),x86_64)
16-
GOARCH := amd64
17-
endif
14+
GOARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
1815
REGISTRY ?= ghcr.io
1916
USERNAME ?= siderolabs
2017
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
@@ -28,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct)
2825

2926
# sync bldr image with pkgfile
3027

31-
BLDR_RELEASE := v0.3.0
28+
BLDR_RELEASE := v0.3.1
3229
BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE)
3330
BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src
3431

@@ -94,21 +91,21 @@ If you already have a compatible builder instance, you may use that instead.
9491
## Artifacts
9592

9693
All artifacts will be output to ./$(ARTIFACTS). Images will be tagged with the
97-
registry "$(REGISTRY)", username "$(USERNAME)", and a dynamic tag (e.g. $(IMAGE):$(TAG)).
94+
registry "$(REGISTRY)", username "$(USERNAME)", and a dynamic tag (e.g. $(IMAGE):$(IMAGE_TAG)).
9895
The registry and username can be overridden by exporting REGISTRY, and USERNAME
9996
respectively.
10097

10198
endef
10299

103100
all: $(TARGETS) ## Builds all targets defined.
104101

102+
$(ARTIFACTS): ## Creates artifacts directory.
103+
@mkdir -p $(ARTIFACTS)
104+
105105
.PHONY: clean
106106
clean: ## Cleans up all artifacts.
107107
@rm -rf $(ARTIFACTS)
108108

109-
$(ARTIFACTS): ## Creates artifacts directory.
110-
@mkdir -p $(ARTIFACTS)
111-
112109
target-%: ## Builds the specified target defined in the Pkgfile. The build result will only remain in the build cache.
113110
@$(BUILD) --target=$* $(COMMON_ARGS) $(TARGET_ARGS) $(CI_ARGS) .
114111

@@ -148,8 +145,7 @@ help: ## This help menu.
148145
@grep -E '^[a-zA-Z%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
149146

150147
.PHONY: release-notes
151-
release-notes:
152-
mkdir -p $(ARTIFACTS)
148+
release-notes: $(ARTIFACTS)
153149
@ARTIFACTS=$(ARTIFACTS) ./hack/release.sh $@ $(ARTIFACTS)/RELEASE_NOTES.md $(TAG)
154150

155151
.PHONY: conformance

Diff for: ‎Pkgfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# syntax = ghcr.io/siderolabs/bldr:v0.3.0
1+
# syntax = ghcr.io/siderolabs/bldr:v0.3.1
22

33
format: v1alpha2
44

55
vars:
66
PKGS_PREFIX: ghcr.io/siderolabs
7-
PKGS_VERSION: v1.8.0-alpha.0-13-gbd70572
7+
PKGS_VERSION: v1.8.0-alpha.0-23-gc309452
88

99
# renovate: datasource=git-refs versioning=git depName=https://github.com/awslabs/tc-redirect-tap.git
1010
tc_redirect_tap_ref: f4bce16532c34740691b2e10c3945020a3c4fd5e

0 commit comments

Comments
 (0)