Skip to content

Commit

Permalink
chore: unify buildkits
Browse files Browse the repository at this point in the history
Use same buildkit for all builds.

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira committed Mar 7, 2025
1 parent a2e2bfe commit 668b65e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2025-01-15T13:38:09Z by kres 3b3f992.
# Generated on 2025-03-07T10:02:10Z by kres d88db2f.

name: default
concurrency:
Expand Down Expand Up @@ -29,15 +29,6 @@ jobs:
- self-hosted
- pkgs
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
services:
buildkitd:
image: moby/buildkit:v0.18.2
options: --privileged
ports:
- 1234:1234
volumes:
- /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
Expand Down Expand Up @@ -77,7 +68,7 @@ jobs:
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
platforms: linux/arm64
driver: remote
endpoint: tcp://127.0.0.1:1234
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
- name: Build
if: github.event_name == 'pull_request'
run: |
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-08-08T15:42:07Z by kres dbf015a.
# Generated on 2025-03-07T10:02:10Z by kres d88db2f.

# common variables

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

# sync bldr image with pkgfile

BLDR_RELEASE := v0.3.2
BLDR_RELEASE := v0.4.1
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

Expand Down

0 comments on commit 668b65e

Please sign in to comment.