Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/ci3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
runs-on: ubuntu-latest
# We either run after a release (tag starting with v), or when the ci-network-scenario label is present in a PR.
needs: ci
if: github.event.pull_request.head.repo.fork != true && github.event.pull_request.draft == false && (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'ci-network-scenario'))
if: github.event.pull_request.head.repo.fork != true && github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'ci-release-pr') && (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'ci-network-scenario'))
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down Expand Up @@ -174,8 +174,7 @@ jobs:
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
NO_SPOT: 1
run:
./.github/ci3.sh network-teardown next-scenario "$NAMESPACE"
run: ./.github/ci3.sh network-teardown next-scenario "$NAMESPACE"

#############
# Benchmarks
Expand Down
12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ endef

# Fast bootstrap
all: release-image barretenberg boxes playground docs aztec-up \
bb-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests
bb-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests release-image-tests

# Full bootstrap
full: release-image barretenberg boxes playground docs aztec-up \
bb-cpp-full yarn-project-benches \
bb-full-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests
bb-full-tests l1-contracts-tests yarn-project-tests boxes-tests playground-tests aztec-up-tests docs-tests noir-protocol-circuits-tests release-image-tests

# Release. Everything plus copy bb cross compiles to ts projects.
release: all bb-cpp-release-dir bb-ts-cross-copy
Expand Down Expand Up @@ -293,7 +293,10 @@ yarn-project-benches: yarn-project
release-image: yarn-project
$(call build,$@,release-image)

boxes: release-image
release-image-tests: release-image
$(call test,$@,release-image)

boxes: yarn-project
$(call build,$@,boxes)

boxes-tests: boxes
Expand All @@ -305,7 +308,6 @@ playground: yarn-project
playground-tests: playground
$(call test,$@,playground)

# Docs - Project documentation
docs: yarn-project
$(call build,$@,docs)

Expand All @@ -315,5 +317,5 @@ docs-tests: docs
aztec-up: yarn-project
$(call build,$@,aztec-up)

aztec-up-tests: aztec-up release-image
aztec-up-tests: aztec-up
$(call test,$@,aztec-up)
4 changes: 3 additions & 1 deletion aztec-up/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.terraform
.terraform*
.DS_Store
.DS_Store
bin/versions
verdaccio-storage
14 changes: 11 additions & 3 deletions aztec-up/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
########################################################################################################################
# A pure ubuntu + docker install. Used for testing releases.
# A minimal ubuntu setup. Used for testing releases.
FROM ubuntu:noble AS dind
RUN apt-get update && apt-get install -y curl
RUN curl -fsSL https://raw.githubusercontent.com/devcontainers/features/refs/heads/main/src/docker-in-docker/install.sh | bash
RUN apt update && apt install -y \
curl \
git \
build-essential \
python3 \
netcat-openbsd \
parallel \
jq \
&& rm -rf /var/lib/apt/lists/*
COPY --chown=1000:1000 verdaccio-storage /home/ubuntu/verdaccio-storage
RUN touch /aztec_release_test_container
6 changes: 6 additions & 0 deletions aztec-up/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,9 @@ VERSION=1.2.3 aztec-up
```

This will install the tagged release version 1.2.3.

## Testing

```
INSTALL_URI=file://$(git rev-parse --show-toplevel)/aztec-up/bin $(git rev-parse --show-toplevel)/aztec-up/bin/aztec-install
```
161 changes: 0 additions & 161 deletions aztec-up/bin/.aztec-run

This file was deleted.

Loading
Loading