Skip to content

Commit

Permalink
Merge branch 'main' into deniallugo-use-configs-from-the-main-repo
Browse files Browse the repository at this point in the history
  • Loading branch information
Deniallugo committed Jul 26, 2024
2 parents 525ef78 + fb55d1c commit 748d0ba
Show file tree
Hide file tree
Showing 91 changed files with 2,374 additions and 2,239 deletions.
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"core": "24.11.0",
"core": "24.12.0",
"prover": "16.1.0"
}
4 changes: 3 additions & 1 deletion .github/workflows/build-docker-from-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ jobs:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}


build-gar-prover-fri-gpu:
name: Build GAR prover FRI GPU
needs: [setup, build-push-prover-images]
Expand All @@ -105,3 +104,6 @@ jobs:
setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}
image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
protocol_version: ${{ needs.build-push-prover-images.outputs.protocol_version }}
secrets:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
7 changes: 7 additions & 0 deletions .github/workflows/build-prover-fri-gpu-gar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ name: Build Prover FRI GPU with builtin setup data

on:
workflow_call:
secrets:
DOCKERHUB_USER:
description: "DOCKERHUB_USER"
required: true
DOCKERHUB_TOKEN:
description: "DOCKERHUB_TOKEN"
required: true
inputs:
image_tag_suffix:
description: "Commit sha or git tag for Docker tag"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:

jobs:
changed_files:
runs-on: [matterlabs-default-infra-runners]
runs-on: ubuntu-latest
name: Get changed files
outputs:
core: ${{ steps.changed-files.outputs.core_any_changed }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-please-cargo-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
name: release-please-update-cargo-lock
jobs:
update_cargo_lock:
runs-on: [matterlabs-ci-runner]
runs-on: [matterlabs-default-infra-runners]

steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/release-test-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:

jobs:
changed_files:
runs-on: [matterlabs-default-infra-runners]
runs-on: ubuntu-latest
name: Test changed-files
outputs:
core: ${{ steps.changed-files-yaml.outputs.core_any_changed }}
Expand Down Expand Up @@ -116,3 +116,6 @@ jobs:
setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}
image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
protocol_version: ${{ needs.build-push-prover-images.outputs.protocol_version }}
secrets:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Cargo.lock
!/etc/env/configs/stage-proofs.toml
!/etc/env/configs/testnet.toml
!/etc/env/configs/mainnet.toml
!/etc/env/configs/prover-local.toml
/etc/env/l1-inits
!/etc/env/l1-inits/stage.env
!/etc/env/l1-inits/stage_proofs.env
Expand Down
Loading

0 comments on commit 748d0ba

Please sign in to comment.