Skip to content

Commit bbd753d

Browse files
frezbofrezbo
committed
feat: bump toolchain
Bump toolchain and rekres. Signed-off-by: Noel Georgi <git@frezbo.dev>
1 parent 61955e9 commit bbd753d

6 files changed

Lines changed: 38 additions & 17 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 5 additions & 5 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 2026-03-06T10:08:54Z by kres 1dd7316.
3+
# Generated on 2026-04-22T11:11:05Z by kres 7d181e7.
44

55
concurrency:
66
group: ${{ github.head_ref || github.run_id }}
@@ -63,7 +63,7 @@ jobs:
6363
git fetch --prune --unshallow
6464
- name: Set up Docker Buildx
6565
id: setup-buildx
66-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
66+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
6767
with:
6868
append: |
6969
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
@@ -76,7 +76,7 @@ jobs:
7676
make
7777
- name: Login to registry
7878
if: github.event_name != 'pull_request'
79-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # version: v3.7.0
79+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # version: v4.1.0
8080
with:
8181
password: ${{ secrets.GITHUB_TOKEN }}
8282
registry: ghcr.io
@@ -106,7 +106,7 @@ jobs:
106106
make release-notes
107107
- name: Release
108108
if: startsWith(github.ref, 'refs/tags/')
109-
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # version: v2.5.0
109+
uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe # version: v2.6.1
110110
with:
111111
body_path: _out/RELEASE_NOTES.md
112112
draft: "true"
@@ -149,7 +149,7 @@ jobs:
149149
git fetch --prune --unshallow
150150
- name: Set up Docker Buildx
151151
id: setup-buildx
152-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
152+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
153153
with:
154154
append: |
155155
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234

‎.github/workflows/slack-notify-ci-failure.yaml‎

Lines changed: 2 additions & 2 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 2025-12-03T10:00:01Z by kres 571923f.
3+
# Generated on 2026-04-22T11:11:05Z by kres 7d181e7.
44

55
"on":
66
workflow_run:
@@ -18,7 +18,7 @@ jobs:
1818
if: github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event != 'pull_request'
1919
steps:
2020
- name: Slack Notify
21-
uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # version: v2.1.1
21+
uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95 # version: v3.0.1
2222
with:
2323
method: chat.postMessage
2424
payload: |

‎.github/workflows/slack-notify.yaml‎

Lines changed: 2 additions & 2 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 2025-12-03T10:00:01Z by kres 571923f.
3+
# Generated on 2026-04-22T11:11:05Z by kres 7d181e7.
44

55
"on":
66
workflow_run:
@@ -24,7 +24,7 @@ jobs:
2424
run: |
2525
echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT
2626
- name: Slack Notify
27-
uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # version: v2.1.1
27+
uses: slackapi/slack-github-action@af78098f536edbc4de71162a307590698245be95 # version: v3.0.1
2828
with:
2929
method: chat.postMessage
3030
payload: |

‎.github/workflows/weekly.yaml‎

Lines changed: 2 additions & 2 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 2026-03-06T10:08:54Z by kres 1dd7316.
3+
# Generated on 2026-04-22T11:11:05Z by kres 7d181e7.
44

55
concurrency:
66
group: ${{ github.head_ref || github.run_id }}
@@ -46,7 +46,7 @@ jobs:
4646
git fetch --prune --unshallow
4747
- name: Set up Docker Buildx
4848
id: setup-buildx
49-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
49+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
5050
with:
5151
append: |
5252
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234

‎Makefile‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2026-01-20T12:20:16Z by kres 1ffefb6.
3+
# Generated on 2026-04-22T11:11:05Z by kres 7d181e7.
44

55
# common variables
66

77
SHA := $(shell git describe --match=none --always --abbrev=8 --dirty)
8-
TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*)
8+
TAG ?= $(shell git describe --tag --always --dirty --match v[0-9]\*)
99
TAG_SUFFIX ?=
10-
ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined')
10+
ABBREV_TAG ?= $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined')
1111
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
1212
ARTIFACTS := _out
1313
IMAGE_TAG ?= $(TAG)$(TAG_SUFFIX)
1414
OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]')
1515
GOARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
16+
CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
1617
REGISTRY ?= ghcr.io
1718
USERNAME ?= siderolabs
1819
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
@@ -126,6 +127,14 @@ $(ARTIFACTS): ## Creates artifacts directory.
126127
clean: ## Cleans up all artifacts.
127128
@rm -rf $(ARTIFACTS)
128129

130+
.PHONY: ci-temp-release-tag
131+
ci-temp-release-tag: ## Generates a temporary release tag for CI run.
132+
@if [ -n "$(CI_RELEASE_TAG)" -a -n "$${GITHUB_ENV}" ]; then \
133+
echo Setting temporary release tag "$(CI_RELEASE_TAG)"; \
134+
echo "TAG=$(CI_RELEASE_TAG)" >> "$${GITHUB_ENV}"; \
135+
echo "ABBREV_TAG=$(CI_RELEASE_TAG)" >> "$${GITHUB_ENV}"; \
136+
fi
137+
129138
target-%: ## Builds the specified target defined in the Pkgfile. The build result will only remain in the build cache.
130139
@$(BUILD) --target=$* $(COMMON_ARGS) $(TARGET_ARGS) $(CI_ARGS) .
131140

@@ -146,7 +155,7 @@ reproducibility-test-local-%: ## Builds the specified target defined in the Pkg
146155
@diffoscope $(ARTIFACTS)/build-a $(ARTIFACTS)/build-b
147156
@rm -rf $(ARTIFACTS)/build-a $(ARTIFACTS)/build-b
148157

149-
$(ARTIFACTS)/bldr: $(ARTIFACTS) ## Downloads bldr binary.
158+
$(ARTIFACTS)/bldr: | $(ARTIFACTS) ## Downloads bldr binary.
150159
@curl -sSL https://github.com/siderolabs/bldr/releases/download/$(BLDR_RELEASE)/bldr-$(OPERATING_SYSTEM)-$(GOARCH) -o $(ARTIFACTS)/bldr
151160
@chmod +x $(ARTIFACTS)/bldr
152161

@@ -182,3 +191,15 @@ conformance:
182191
@docker pull $(CONFORMANCE_IMAGE)
183192
@docker run --rm -it -v $(PWD):/src -w /src $(CONFORMANCE_IMAGE) enforce
184193

194+
.PHONY: renovate-local
195+
renovate-local: ## runs renovate locally to check syntax and test configuration
196+
@docker run --rm \
197+
--user $(shell id -u):$(shell id -g) \
198+
-v $(PWD):/src \
199+
-w /src \
200+
-e GITHUB_TOKEN \
201+
-e LOG_LEVEL=debug \
202+
-e RENOVATE_PLATFORM=local \
203+
-e RENOVATE_DRY_RUN=full \
204+
renovate/renovate
205+

‎Pkgfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# syntax = ghcr.io/siderolabs/bldr:v0.5.5
1+
# syntax = ghcr.io/siderolabs/bldr:v0.5.6
22

33
# Sync bldr image with Makefile
44

55
format: v1alpha2
66

77
vars:
8-
TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v1.12.0-5-g5417b27
8+
TOOLCHAIN_IMAGE: ghcr.io/siderolabs/toolchain:v1.12.0-10-gec7c6e8
99

1010
# renovate: datasource=github-tags depName=argp-standalone/argp-standalone
1111
argp_standalone_version: 1.5.0

0 commit comments

Comments
 (0)