Skip to content

Commit 6fcecb9

Browse files
yorikyorik
authored
ci: Remove prover-gpu-fri and witness-vector-generator from build (#3513)
## What ❔ Remove prover-gpu-fri and witness-vector-generator from build. <!-- What are the changes this PR brings about? --> <!-- Example: This PR adds a PR template to the repo. --> <!-- (For bigger PRs adding more context is appreciated) --> ## Why ❔ To cleanup unneeded builds. <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`. ref ZKD-2084
1 parent 52de758 commit 6fcecb9

File tree

5 files changed

+7
-74
lines changed

5 files changed

+7
-74
lines changed

.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml renamed to .github/workflows/build-circuit-prover-gpu-gar.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Download Setup data
2929
run: |
30-
gsutil -m rsync -r gs://matterlabs-setup-data-us/${{ inputs.setup_keys_id }} docker/prover-gpu-fri-gar
30+
gsutil -m rsync -r gs://matterlabs-setup-data-us/${{ inputs.setup_keys_id }} docker/circuit-prover-gpu-gar
3131
3232
- name: Login to us-central1 GAR
3333
run: |
@@ -47,32 +47,6 @@ jobs:
4747
run: |
4848
gcloud auth print-access-token --lifetime=7200 --impersonate-service-account=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com | docker login -u oauth2accesstoken --password-stdin https://europe-docker.pkg.dev
4949
50-
- name: Build and push prover-gpu-fri-gar
51-
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
52-
with:
53-
context: docker/prover-gpu-fri-gar
54-
build-args: |
55-
PROVER_IMAGE=${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
56-
push: true
57-
tags: |
58-
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
59-
60-
- name: Build and push prover-gpu-fri-gar to Asia GAR
61-
run: |
62-
docker buildx imagetools create \
63-
--tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
64-
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
65-
66-
- name: Build and push prover-gpu-fri-gar to Europe GAR
67-
run: |
68-
docker buildx imagetools create \
69-
--tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
70-
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
71-
72-
- name: Move Setup data from prover-gpu-fri-gar to circuit-prover-gpu-gar
73-
run: |
74-
mv -v docker/prover-gpu-fri-gar/*.bin docker/circuit-prover-gpu-gar/
75-
7650
- name: Build and push circuit-prover-gpu-gar
7751
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
7852
with:

‎.github/workflows/build-docker-from-tag.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ jobs:
110110
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
111111
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
112112

113-
build-gar-prover-fri-gpu-and-circuit-prover-gpu-gar:
113+
build-circuit-prover-gpu-gar:
114114
name: Build GAR prover FRI GPU
115115
needs: [setup, build-push-prover-images]
116-
uses: ./.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml
116+
uses: ./.github/workflows/build-circuit-prover-gpu-gar.yml
117117
if: contains(github.ref_name, 'prover')
118118
with:
119119
setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}

‎.github/workflows/build-proof-fri-gpu-compressor-gar.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ jobs:
5858
tags: |
5959
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/proof-fri-gpu-compressor-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
6060
61-
- name: Build and push prover-gpu-fri-gar to Asia GAR
61+
- name: Build and push proof-fri-gpu-compressor-gar to Asia GAR
6262
run: |
6363
docker buildx imagetools create \
6464
--tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/proof-fri-gpu-compressor-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
6565
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/proof-fri-gpu-compressor-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
6666
67-
- name: Build and push prover-gpu-fri-gar to Europe GAR
67+
- name: Build and push proof-fri-gpu-compressor-gar to Europe GAR
6868
run: |
6969
docker buildx imagetools create \
7070
--tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/proof-fri-gpu-compressor-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }} \

‎.github/workflows/build-prover-template.yml‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ jobs:
9898
matrix:
9999
components:
100100
- witness-generator
101-
- prover-gpu-fri
102-
- witness-vector-generator
103101
- prover-fri-gateway
104102
- prover-job-monitor
105103
- proof-fri-gpu-compressor
@@ -201,42 +199,3 @@ jobs:
201199
docker push us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:latest
202200
docker push ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:latest
203201
docker push matterlabs/${{ matrix.components }}:latest
204-
205-
copy-images:
206-
name: Copy images between docker registries
207-
needs: [build-images, get-protocol-version]
208-
env:
209-
PROTOCOL_VERSION: ${{ needs.get-protocol-version.outputs.protocol_version }}
210-
runs-on: matterlabs-ci-runner
211-
if: ${{ inputs.action == 'push' }}
212-
strategy:
213-
matrix:
214-
component:
215-
- witness-vector-generator
216-
steps:
217-
- name: Set up Docker Buildx
218-
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
219-
220-
- name: Login to us-central1 GAR
221-
run: |
222-
gcloud auth print-access-token --lifetime=7200 --impersonate-service-account=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com | docker login -u oauth2accesstoken --password-stdin https://us-docker.pkg.dev
223-
224-
- name: Login and push to Asia GAR
225-
run: |
226-
gcloud auth print-access-token --lifetime=7200 --impersonate-service-account=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com | docker login -u oauth2accesstoken --password-stdin https://asia-docker.pkg.dev
227-
docker buildx imagetools create \
228-
--tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ inputs.image_tag_suffix }} \
229-
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ inputs.image_tag_suffix }}
230-
docker buildx imagetools create \
231-
--tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }} \
232-
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }}
233-
234-
- name: Login and push to Europe GAR
235-
run: |
236-
gcloud auth print-access-token --lifetime=7200 --impersonate-service-account=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com | docker login -u oauth2accesstoken --password-stdin https://europe-docker.pkg.dev
237-
docker buildx imagetools create \
238-
--tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ inputs.image_tag_suffix }} \
239-
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ env.PROTOCOL_VERSION }}-${{ inputs.image_tag_suffix }}
240-
docker buildx imagetools create \
241-
--tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }} \
242-
us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }}

‎.github/workflows/release-test-stage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ jobs:
121121
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
122122
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
123123

124-
build-gar-prover-fri-gpu-and-circuit-prover-gpu-gar:
124+
build-circuit-prover-gpu-gar:
125125
name: Build GAR prover FRI GPU
126126
needs: [setup, build-push-prover-images]
127-
uses: ./.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml
127+
uses: ./.github/workflows/build-circuit-prover-gpu-gar.yml
128128
if: needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true'
129129
with:
130130
setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}

0 commit comments

Comments
 (0)