Skip to content

Commit

Permalink
Merge branch 'main' into planner-refactor-debug
Browse files Browse the repository at this point in the history
Signed-off-by: Tal Derei <[email protected]>
  • Loading branch information
TalDerei authored Apr 26, 2024
2 parents 7eed426 + c3de340 commit 2263397
Show file tree
Hide file tree
Showing 240 changed files with 12,804 additions and 1,586 deletions.
4 changes: 3 additions & 1 deletion .cargo/config
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[build]
# Enable Tokio's `tracing` support for `tokio-console`
rustflags = ["--cfg", "tokio_unstable"]
# rustflags = ["--cfg", "tokio_unstable"]
# Note(erwan): We decided to disable it for the time being,
# I'm keeping this around to be able to reactivate it on a whim.
8 changes: 2 additions & 6 deletions .github/workflows/buf-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,8 @@ jobs:
with:
lfs: true

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: false
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable

- uses: bufbuild/buf-setup-action@v1
with:
Expand Down
79 changes: 8 additions & 71 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,29 @@ jobs:
lfs: true

- name: Log in to the Docker Hub container registry (for pulls)
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Log in to the GitHub container registry (for pushes)
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/penumbra-zone/penumbra

- name: Build and push Docker image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64
Expand All @@ -69,26 +66,26 @@ jobs:
uses: actions/checkout@v4

- name: Log in to the Docker Hub container registry (for pulls)
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Log in to the GitHub container registry (for pushes)
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/penumbra-zone/grafana

- name: Build and push Docker image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64
Expand All @@ -97,27 +94,6 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

osiris:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
needs:
- penumbra
steps:
- name: Checkout repository
uses: actions/checkout@v4
# We use the GHA Repository Dispatch functionality to trigger a container
# build in the penumbra-zone/osiris repo.
- name: Trigger remote build
shell: bash
env:
GITHUB_PAT: ${{ secrets.GH_PAT }}
run: |-
export PENUMBRA_VERSION='${{ github.event.inputs.image_tag || github.ref_name }}'
cd deployments/
./scripts/gha-repository-dispatch penumbra-zone/osiris
galileo:
runs-on: ubuntu-latest
permissions:
Expand Down Expand Up @@ -145,42 +121,3 @@ jobs:
fi
cd deployments/
./scripts/gha-repository-dispatch penumbra-zone/galileo
relayer:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Log in to the Docker Hub container registry (for pulls)
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Log in to the GitHub container registry (for pushes)
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/penumbra-zone/relayer

- name: Build and push Docker image
uses: docker/build-push-action@v3
with:
context: .
platforms: linux/amd64
file: deployments/containerfiles/Dockerfile-relayer
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
4 changes: 2 additions & 2 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ jobs:
service_account: '[email protected]'

- name: get gke credentials
uses: google-github-actions/get-gke-credentials@v1
uses: google-github-actions/get-gke-credentials@v2
with:
cluster_name: testnet
project_id: penumbra-sl-testnet
location: us-central1

- name: install helmfile
uses: mamezou-tech/setup-helmfile@v1.3.0
uses: mamezou-tech/setup-helmfile@v2.0.0
with:
helmfile-version: "v0.157.0"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-testnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ jobs:
service_account: '[email protected]'

- name: get gke credentials
uses: google-github-actions/get-gke-credentials@v1
uses: google-github-actions/get-gke-credentials@v2
with:
cluster_name: testnet
project_id: penumbra-sl-testnet
location: us-central1

- name: install helmfile
uses: mamezou-tech/setup-helmfile@v1.3.0
uses: mamezou-tech/setup-helmfile@v2.0.0
with:
helmfile-version: "v0.157.0"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/disable-faucet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
service_account: '[email protected]'

- name: get gke credentials
uses: google-github-actions/get-gke-credentials@v1
uses: google-github-actions/get-gke-credentials@v2
with:
cluster_name: testnet
project_id: penumbra-sl-testnet
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/new-issues-labeled-needs-refinement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Adds the `needs-refinement` label to newly opened issues.
name: New issues need refinement
on:
issues:
types:
- opened
jobs:
label_issues:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- run: gh issue edit "$NUMBER" --add-label "$LABELS"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
NUMBER: ${{ github.event.issue.number }}
# Separate multiple labels with commas if other labels are ever
# needed e.g., `needs-refinement,foo`.
LABELS: needs-refinement
19 changes: 10 additions & 9 deletions .github/workflows/notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ jobs:
uses: dtolnay/rust-toolchain@nightly
- name: Load Rust caching
uses: astriaorg/[email protected]
- name: Load get-version action to grab version component of deployment path
uses: battila7/get-version-action@v2
id: get_version

# Previously we used a GHA helper to look up the version, which was overkill.
# Let's still log the version of the docs we intend to build.
- name: Print version component of deployment path
run: echo ${{ steps.get_version.outputs.version }}
run: echo ${{ github.event.inputs.image_tag || github.ref_name }}

# Ostensibly building from source, but the cache-loading above
# ensures we don't need to rebuild frequently.
- name: Install mdbook dependencies
run: cargo install mdbook mdbook-katex mdbook-mermaid mdbook-linkcheck
# Make sure to install with `+nightly`, because that's the toolchain we'll use for building docs.
run: cargo +nightly install mdbook mdbook-katex mdbook-mermaid mdbook-linkcheck

- name: Build software guide
run: cd docs/guide && mdbook build
Expand All @@ -40,7 +41,7 @@ jobs:
cd docs/guide
rm -rf firebase-tmp
mkdir firebase-tmp
mv book/html firebase-tmp/${{ steps.get_version.outputs.version }}
mv book/html firebase-tmp/${{ github.event.inputs.image_tag || github.ref_name }}
tree firebase-tmp
- name: Deploy software guide to firebase
Expand All @@ -60,7 +61,7 @@ jobs:
cd docs/protocol
rm -rf firebase-tmp
mkdir firebase-tmp
mv book/html firebase-tmp/${{ steps.get_version.outputs.version }}
mv book/html firebase-tmp/${{ github.event.inputs.image_tag || github.ref_name }}
tree firebase-tmp
- name: Deploy protocol spec to firebase
Expand All @@ -79,9 +80,9 @@ jobs:
cd docs/rustdoc
if [ -d "firebase-tmp" ]; then rm -rf firebase-tmp; fi
mkdir firebase-tmp
mv ../../target/doc firebase-tmp/${{ steps.get_version.outputs.version }}
mv ../../target/doc firebase-tmp/${{ github.event.inputs.image_tag || github.ref_name }}
# Copy in the static index file
cp index.html firebase-tmp/${{ steps.get_version.outputs.version }}
cp index.html firebase-tmp/${{ github.event.inputs.image_tag || github.ref_name }}
- name: Deploy API docs to firebase
uses: w9jds/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
with:
submodules: recursive
- name: Install Rust
run: rustup update "1.73" --no-self-update && rustup default "1.73"
run: rustup update "1.75" --no-self-update && rustup default "1.75"
- name: Install cargo-dist
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.5.0/cargo-dist-installer.sh | sh"
- id: plan
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
with:
lfs: true
- name: Install Rust
run: rustup update "1.73" --no-self-update && rustup default "1.73"
run: rustup update "1.75" --no-self-update && rustup default "1.75"
- uses: swatinem/rust-cache@v2
- name: Install cargo-dist
run: ${{ matrix.install_dist }}
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,18 @@ jobs:
- name: Load rust cache
uses: astriaorg/[email protected]
- run: cargo fmt --all -- --check

check:
name: Check all crate features
runs-on: buildjet-8vcpu-ubuntu-2204
steps:
- uses: actions/checkout@v4
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable
- name: Load rust cache
uses: astriaorg/[email protected]
- name: install cargo-hack
run: cargo install cargo-hack
# Build each crate separately, to validate that the feature-gating is working.
# This is a lighter-weight version of `cargo check-all-features --workspace --release`.
- run: ./deployments/scripts/check-crate-feature-sets
11 changes: 7 additions & 4 deletions .github/workflows/smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,21 @@ jobs:
- uses: actions/checkout@v4
with:
lfs: true
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable

- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable

- name: Load rust cache
uses: astriaorg/[email protected]

- name: Install cometbft binary
run: ./deployments/scripts/install-cometbft

- name: Run the smoke test suite
run: |
export PATH="$HOME/bin:$PATH"
./deployments/scripts/smoke-test.sh
- name: Display comet logs
if: always()
run: cat deployments/logs/comet.log
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/summoner_smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- uses: actions/checkout@v4
with:
lfs: true
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable

- name: Install rust toolchain
uses: dtolnay/rust-toolchain@stable

- name: Load rust cache
uses: astriaorg/[email protected]

Expand Down
2 changes: 1 addition & 1 deletion COMPATIBILITY.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| Application version (Name)| Penumbra crate version | CometBFT | Protobuf |
| ------------------------- | ---------------------- | -------- | -------- |
| 1 (Testnet 70) | v0.70.x | v0.37.5 | v1 |
| 2 (Testnet 71) | v0.71.x | v0.37.5 | v1 |
| 2 (Testnet 73) | v0.73.x | v0.37.5 | v1 |
Loading

0 comments on commit 2263397

Please sign in to comment.