Skip to content

Commit 17d43b2

Browse files
committed
feat: update Go to 1.23.7
See https://go.dev/doc/devel/release#go1.23.minor Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent b2ede52 commit 17d43b2

File tree

5 files changed

+41
-163
lines changed

5 files changed

+41
-163
lines changed

.github/renovate.json

Lines changed: 31 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,144 +1,60 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"description": "THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.",
4+
"prHeader": "Update Request | Renovate Bot",
35
"extends": [
46
":dependencyDashboard",
57
":gitSignOff",
68
":semanticCommitScopeDisabled",
79
"schedule:earlyMondays"
810
],
9-
"prHeader": "Update Request | Renovate Bot",
10-
"regexManagers": [
11+
"customManagers": [
1112
{
13+
"customType": "regex",
14+
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}",
1215
"fileMatch": [
1316
"Pkgfile"
1417
],
1518
"matchStrings": [
16-
"# renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s(?:\\s+.*_(?:version|VERSION):\\s+(?<currentValue>.*))?(?:\\s.*_(?:ref|REF):\\s+(?<currentDigest>.*))?"
17-
],
18-
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
19+
"# renovate: datasource=(?<datasource>.*?)(?:\\s+extractVersion=(?<extractVersion>.+?))?(?:\\s+versioning=(?<versioning>.+?))?\\s+depName=(?<depName>.+?)?\\s(?:.*_(?:version|VERSION):\\s+(?<currentValue>.*))?(?:(\\s)?.*_(?:ref|REF):\\s+(?<currentDigest>.*))?"
20+
]
1921
},
2022
{
23+
"customType": "regex",
24+
"datasourceTemplate": "github-tags",
25+
"depNameTemplate": "siderolabs/bldr",
26+
"versioningTemplate": "semver",
2127
"fileMatch": [
22-
"Pkgfile",
23-
"Makefile"
28+
"Pkgfile"
2429
],
2530
"matchStrings": [
2631
"ghcr.io\\/siderolabs\\/bldr:(?<currentValue>v.*)"
27-
],
28-
"depNameTemplate": "siderolabs/bldr",
29-
"datasourceTemplate": "github-tags",
30-
"versioningTemplate": "semver"
32+
]
3133
}
3234
],
3335
"packageRules": [
3436
{
35-
"matchPackageNames": [
36-
"golang/go",
37-
"mirror/ncurses",
38-
"PCRE2Project/pcre2",
39-
"plougher/squashfs-tools",
40-
"SELinuxProject/selinux",
41-
"git://git.savannah.gnu.org/make.git",
42-
"git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git",
43-
"git://git.savannah.gnu.org/automake.git",
44-
"git://git.savannah.gnu.org/bison.git",
45-
"git://git.savannah.gnu.org/coreutils.git",
46-
"git://git.savannah.gnu.org/diffutils.git",
47-
"git://sourceware.org/git/elfutils.git",
48-
"git://git.savannah.gnu.org/gettext.git",
49-
"git://git.savannah.gnu.org/gperf.git",
50-
"git://git.savannah.gnu.org/grep.git",
51-
"git://git.savannah.gnu.org/gzip.git",
52-
"git://git.kernel.org/pub/scm/devel/pahole/pahole.git",
53-
"git://git.savannah.gnu.org/patch.git",
54-
"https://gitlab.freedesktop.org/pkg-config/pkg-config.git",
55-
"git://git.savannah.gnu.org/sed.git",
56-
"git://git.savannah.gnu.org/texinfo.git",
57-
"git://git.kernel.org/pub/scm/libs/libcap/libcap.git"
58-
],
59-
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>\\d+)?$"
37+
"groupName": "dependencies",
38+
"matchUpdateTypes": [
39+
"major",
40+
"minor",
41+
"patch",
42+
"pin",
43+
"digest"
44+
]
6045
},
6146
{
62-
"matchPackageNames": [
63-
"abseil/abseil-cpp"
64-
],
65-
"versioning": "regex:^(?<major>\\d{4})(?<minor>\\d{2})(?<patch>\\d{2})\\.?(?<build>\\d+)?$"
47+
"enabled": false,
48+
"matchFileNames": [
49+
"Dockerfile"
50+
]
6651
},
6752
{
68-
"matchPackageNames": [
69-
"git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git",
70-
"systemd/systemd"
71-
],
72-
"versioning": "regex:^(?<major>\\d+)\\.?(?<minor>\\d+)?\\.?(?<patch>\\d+)?$"
73-
},
74-
{
75-
"matchPackageNames": [
76-
"protocolbuffers/protobuf"
77-
],
78-
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)"
79-
},
80-
{
81-
"matchPackageNames": [
82-
"curl/curl",
83-
"libexpat/libexpat",
84-
"file/file",
85-
"git://git.savannah.gnu.org/cpio.git",
86-
"git://git.savannah.gnu.org/tar.git"
87-
],
88-
"versioning": "regex:^(?<major>\\d+)_(?<minor>\\d+)_?(?<patch>\\d+)?$"
89-
},
90-
{
91-
"matchPackageNames": [
92-
"git://git.savannah.gnu.org/autoconf.git",
93-
"git://git.savannah.gnu.org/bash.git"
94-
],
95-
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>\\d+)?$"
96-
},
97-
{
98-
"matchPackageNames": [
99-
"Perl/perl5"
100-
],
101-
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d[02468]+)\\.(?<patch>\\d+)$"
102-
},
103-
{
104-
"matchPackagePatterns": [
105-
"*"
106-
],
107-
"matchDatasources": [
108-
"docker"
109-
],
110-
"groupName": "container images"
111-
},
112-
{
113-
"matchPackagePatterns": [
114-
"*"
115-
],
116-
"matchDatasources": [
117-
"go",
118-
"golang-version"
119-
],
120-
"groupName": "go packages"
121-
},
122-
{
123-
"matchPackagePatterns": [
124-
"*"
125-
],
126-
"matchDatasources": [
127-
"npm"
128-
],
129-
"groupName": "node packages"
130-
},
131-
{
132-
"matchPackagePatterns": [
133-
"*"
134-
],
135-
"matchDatasources": [
136-
"git-refs",
137-
"git-tags",
138-
"github-tags",
139-
"github-releases"
140-
],
141-
"groupName": "releases"
53+
"enabled": false,
54+
"matchFileNames": [
55+
".github/workflows/*.yaml"
56+
]
14257
}
143-
]
58+
],
59+
"separateMajorMinor": false
14460
}

.github/workflows/ci.yaml

Lines changed: 3 additions & 21 deletions
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-11-25T17:37:38Z by kres 232fe63.
3+
# Generated on 2025-03-11T10:34:36Z by kres ec5ec04.
44

55
name: default
66
concurrency:
@@ -31,15 +31,6 @@ jobs:
3131
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
3232
outputs:
3333
labels: ${{ steps.retrieve-pr-labels.outputs.result }}
34-
services:
35-
buildkitd:
36-
image: moby/buildkit:v0.17.2
37-
options: --privileged
38-
ports:
39-
- 1234:1234
40-
volumes:
41-
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
42-
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
4334
steps:
4435
- name: gather-system-info
4536
id: system-info
@@ -79,7 +70,7 @@ jobs:
7970
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
8071
platforms: linux/arm64
8172
driver: remote
82-
endpoint: tcp://127.0.0.1:1234
73+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
8374
- name: Build
8475
if: github.event_name == 'pull_request'
8576
run: |
@@ -127,15 +118,6 @@ jobs:
127118
if: contains(fromJSON(needs.default.outputs.labels), 'integration/reproducibility')
128119
needs:
129120
- default
130-
services:
131-
buildkitd:
132-
image: moby/buildkit:v0.17.2
133-
options: --privileged
134-
ports:
135-
- 1234:1234
136-
volumes:
137-
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
138-
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
139121
steps:
140122
- name: gather-system-info
141123
id: system-info
@@ -175,7 +157,7 @@ jobs:
175157
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
176158
platforms: linux/arm64
177159
driver: remote
178-
endpoint: tcp://127.0.0.1:1234
160+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
179161
- name: reproducibility-test
180162
run: |
181163
make reproducibility-test

.github/workflows/weekly.yaml

Lines changed: 2 additions & 11 deletions
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-11-25T17:37:38Z by kres 232fe63.
3+
# Generated on 2025-03-11T10:34:36Z by kres ec5ec04.
44

55
name: weekly
66
concurrency:
@@ -14,15 +14,6 @@ jobs:
1414
runs-on:
1515
- self-hosted
1616
- pkgs
17-
services:
18-
buildkitd:
19-
image: moby/buildkit:v0.17.2
20-
options: --privileged
21-
ports:
22-
- 1234:1234
23-
volumes:
24-
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
25-
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
2617
steps:
2718
- name: gather-system-info
2819
id: system-info
@@ -62,7 +53,7 @@ jobs:
6253
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
6354
platforms: linux/arm64
6455
driver: remote
65-
endpoint: tcp://127.0.0.1:1234
56+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
6657
- name: reproducibility-test
6758
run: |
6859
make reproducibility-test

Makefile

Lines changed: 2 additions & 13 deletions
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-11-25T17:37:38Z by kres 232fe63.
3+
# Generated on 2025-03-11T10:34:36Z by kres ec5ec04.
44

55
# common variables
66

@@ -25,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct)
2525

2626
# sync bldr image with pkgfile
2727

28-
BLDR_RELEASE := v0.3.2
28+
BLDR_RELEASE := v0.4.1
2929
BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE)
3030
BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src
3131

@@ -36,13 +36,11 @@ PLATFORM ?= linux/amd64,linux/arm64
3636
PROGRESS ?= auto
3737
PUSH ?= false
3838
CI_ARGS ?=
39-
BUILDKIT_MULTI_PLATFORM ?= 1
4039
COMMON_ARGS = --file=Pkgfile
4140
COMMON_ARGS += --provenance=false
4241
COMMON_ARGS += --progress=$(PROGRESS)
4342
COMMON_ARGS += --platform=$(PLATFORM)
4443
COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
45-
COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=$(BUILDKIT_MULTI_PLATFORM)
4644

4745
# targets defines all the available targets
4846

@@ -112,15 +110,6 @@ target-%: ## Builds the specified target defined in the Pkgfile. The build resu
112110

113111
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.
114112
@$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)"
115-
@PLATFORM=$(PLATFORM) DEST=$(DEST) bash -c '\
116-
for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \
117-
echo $$platform; \
118-
directory="$${platform//\//_}"; \
119-
if [[ -d "$$DEST/$$directory" ]]; then \
120-
mv "$$DEST/$$directory/"* $$DEST; \
121-
rmdir "$$DEST/$$directory/"; \
122-
fi; \
123-
done'
124113

125114
docker-%: ## Builds the specified target defined in the Pkgfile using the docker output type. The build result will be loaded into Docker.
126115
@$(MAKE) target-$* TARGET_ARGS="$(TARGET_ARGS)"

Pkgfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ vars:
124124
gmp_sha512: c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
125125

126126
# renovate: datasource=github-tags extractVersion=^go(?<version>.*)$ depName=golang/go
127-
golang_version: 1.23.6
128-
golang_sha256: 039c5b04e65279daceee8a6f71e70bd05cf5b801782b6f77c6e19e2ed0511222
129-
golang_sha512: c504476d42cdbcd1b6afe53c0974e82c19eb0efac974bc06d41c1641440676891cfe6416455a0cfc81fe82902a9b82ea0a1d95089c676667d05487e45f5e04e3
127+
golang_version: 1.23.7
128+
golang_sha256: 7cfabd46b73eb4c26b19d69515dd043d7183a6559acccd5cfdb25eb6b266a458
129+
golang_sha512: 79192b760ab6fcc9512fd879a9484a3566fdeec5eace36c54b728cd9cb033e7ac68065a42fc657b351a106d684b79fdbefbf682cf63209c0191e7e7c8c0a0147
130130

131131
# renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.savannah.gnu.org/gperf.git
132132
gperf_version: 3.1

0 commit comments

Comments
 (0)