Skip to content

Commit 5ff2200

Browse files
authored
chore: Revert "feat: Bootstrap Makefile" (#18276)
Seeing oddities.
1 parent 401df56 commit 5ff2200

File tree

42 files changed

+496
-895
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+496
-895
lines changed

.github/workflows/ci3.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ jobs:
7878
if: contains(github.event.pull_request.labels.*.name, 'barretenberg-ci') || (github.event.pull_request.base.ref == 'merge-train/barretenberg')
7979
run: echo "CI_BARRETENBERG=1" >> $GITHUB_ENV
8080

81-
- name: CI Release PR Override
82-
if: contains(github.event.pull_request.labels.*.name, 'ci-release-pr')
83-
run: echo "CI_RELEASE_PR=1" >> $GITHUB_ENV
84-
8581
# Allow full concurrency for merge-train PRs, one-run-per-branch for everything else.
8682
- name: Set Instance Postfix for merge-train
8783
if: startsWith(github.event.pull_request.head.ref, 'merge-train/')
@@ -143,21 +139,17 @@ jobs:
143139
EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY: ${{ secrets.GCP_SEPOLIA_API_KEY }}
144140
EXTERNAL_ETHEREUM_CONSENSUS_HOST_API_KEY_HEADER: "X-goog-api-key"
145141
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
146-
PR_NUMBER: ${{ github.event.pull_request.number }}
147142
run: |
148143
if [ "${{ github.event_name }}" == "merge_group" ] || [ "${CI_MERGE_QUEUE:-0}" -eq 1 ]; then
149144
exec ./ci.sh merge-queue
150-
elif [ "${CI_RELEASE_PR:-0}" -eq 1 ]; then
151-
git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}
152-
tag_name="v0.0.1-commit.$(git rev-parse --short HEAD)"
153-
git tag ${tag_name}
154-
git push origin ${tag_name}
155145
elif [ "${CI_FULL:-0}" -eq 1 ]; then
156146
exec ./ci.sh full
157147
elif [ "${CI_DOCS:-0}" -eq 1 ]; then
158148
exec ./ci.sh docs
159149
elif [ "${CI_BARRETENBERG:-0}" -eq 1 ]; then
160150
exec ./ci.sh barretenberg
151+
elif [ "${{ contains(github.ref, '-nightly.') }}" == "true" ] || [ "${{ contains(github.ref, '-rc.') }}" == "true" ]; then
152+
exec ./ci.sh nightly
161153
elif [ "${{ startsWith(github.ref, 'refs/tags/v') }}" == "true" ]; then
162154
exec ./ci.sh release
163155
else

.github/workflows/test-network-scenarios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: |
5252
git fetch --tags --force
5353
tag=$(git tag --points-at "${{ github.event.workflow_run.head_sha }}" | head -n1)
54-
if echo "$tag" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+' && ! echo "$tag" | grep -q 'commit'; then
54+
if echo "$tag" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+' && ! echo "$tag" | grep -q 'fake'; then
5555
echo "should_run=true" >> $GITHUB_OUTPUT
5656
echo "Found semver tag: $tag"
5757
else

.test_patterns.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ tests:
9999
skip: true
100100
owners:
101101
- *charlie
102-
- regex: "noir-protocol-circuits blob blob_batching::tests::test_max_blobs_batched"
103-
error_regex: "core dumped"
104-
owners:
105-
- *tom
106102

107103
# AD: hit this flake
108104
# 18:04:38 thread 'arb_program_freqs_in_expected_range' panicked at tooling/ast_fuzzer/tests/calibration.rs:75:5:
@@ -194,10 +190,6 @@ tests:
194190
error_regex: "ContractFunctionExecutionError: The contract function"
195191
owners:
196192
- *mitch
197-
- regex: "slasher/src/tally_slasher_client.test.ts"
198-
error_regex: "Expected length: 1"
199-
owners:
200-
- *palla
201193
- regex: "archiver/src/archiver/archiver.test.ts"
202194
error_regex: "Received number of calls: 1"
203195
owners:

Makefile

Lines changed: 0 additions & 324 deletions
This file was deleted.

0 commit comments

Comments
 (0)