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

Commit cf29ed0

Browse files
committed
chore: unify buildkits
Use same buildkit for all builds. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent c201b87 commit cf29ed0

File tree

2 files changed

+5
-32
lines changed

2 files changed

+5
-32
lines changed

.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 2025-03-05T12:43:59Z by kres 30e7a85.
3+
# Generated on 2025-03-07T10:01:02Z by kres d88db2f.
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.20.0
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.20.0
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 2025-03-05T12:43:59Z by kres 30e7a85.
3+
# Generated on 2025-03-07T10:01:02Z by kres d88db2f.
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.20.0
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

0 commit comments

Comments
 (0)