Skip to content

Commit d02d972

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

File tree

2 files changed

+5
-32
lines changed

2 files changed

+5
-32
lines changed

.github/workflows/ci.yaml

+3-21
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-05T16:36:46Z by kres e2c7efe.
3+
# Generated on 2025-03-07T10:01:40Z 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: |
@@ -141,15 +132,6 @@ jobs:
141132
if: contains(fromJSON(needs.default.outputs.labels), 'integration/reproducibility')
142133
needs:
143134
- default
144-
services:
145-
buildkitd:
146-
image: moby/buildkit:v0.20.0
147-
options: --privileged
148-
ports:
149-
- 1234:1234
150-
volumes:
151-
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
152-
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
153135
steps:
154136
- name: gather-system-info
155137
id: system-info
@@ -189,7 +171,7 @@ jobs:
189171
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
190172
platforms: linux/arm64
191173
driver: remote
192-
endpoint: tcp://127.0.0.1:1234
174+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
193175
- name: reproducibility-test
194176
run: |
195177
make reproducibility-test

.github/workflows/weekly.yaml

+2-11
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-05T16:36:46Z by kres e2c7efe.
3+
# Generated on 2025-03-07T10:01:40Z 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)