Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into joroshiba/use-depot
Browse files Browse the repository at this point in the history
  • Loading branch information
joroshiba committed Feb 12, 2025
2 parents dfa2ac6 + 456beb0 commit 64aad25
Show file tree
Hide file tree
Showing 263 changed files with 7,615 additions and 5,496 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@ jobs:
if: needs.run_checker.outputs.run_lint_rust == 'true'
steps:
- uses: actions/checkout@v4
- name: Install just
uses: taiki-e/install-action@just
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2024-09-15
toolchain: nightly-2024-10-03
components: rustfmt
- name: run rustfmt
run: cargo +nightly-2024-09-15 fmt --all -- --check
run: just lint rust-fmt

toml:
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
REGISTRY: ghcr.io
FULL_REF: ${{ inputs.tag && format('refs/tags/{0}', inputs.tag) || github.ref }}
# This must match the entry in rust-toolchain.toml at the repository root
RUSTUP_TOOLCHAIN: "1.81.0"
RUSTUP_TOOLCHAIN: "1.83.0"

jobs:
upload-binaries:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/reusable-docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ jobs:
tags: |
type=ref,event=pr
type=match,pattern=refs/tags/${{ inputs.binary-name }}-v(.*),group=1,enable=${{ startsWith(env.FULL_REF, 'refs/tags/') }},value=${{ env.FULL_REF }}
type=sha
type=sha,format=short
type=sha,format=long
# set the actual commit SHA from the PR head instead of from the PR merge commit (alternatively, we could checkout the PR head in actions/checkout)
type=raw,value=sha-${{ github.event.pull_request.head.sha || github.sha }},enable=${{ startsWith(env.FULL_REF, 'refs/pull/') }}
# set latest tag for `main` branch
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Scheduled
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *'

Expand All @@ -14,3 +15,38 @@ jobs:
- uses: rustsec/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
with:
# Utilize a separate token for the stale worker to avoid rate limiting
repo-token: ${{ secrets.STALE_WORKER_TOKEN }}
# This is half the number of operations allowed per hour for the
# GitHub API.
operations-per-run: 2500
days-before-stale: 45
days-before-close: 7
# start with the oldest issues first, as they are most likely to be stale.
ascending: true
stale-issue-label: 'stale'
stale-pr-label: 'stale'
# Allow tagging issues in such a way that they are exempt from the stale check
exempt-issue-labels: 'ignore-stale'
exempt-pr-labels: 'ignore-stale'
# Labels to easily find issues closed because they are stale.
close-issue-label: 'closed-stale'
close-pr-label: 'closed-stale'
stale-issue-message: |
This issue is stale because it has been open 45 days with no activity. Remove stale label or this issue
be closed in 7 days.
close-issue-message: 'This issue was closed because it was stale'
stale-pr-message: |
This PR is stale because it has been open 45 days with no activity. Remove stale label or this PR will be
closed in 7 days.
close-pr-message: 'This PR was closed because it has been stale.'
# Exempt anything added to a milestone from being considered stale
exempt-all-milestones: true
25 changes: 11 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
RUSTFLAGS: "-D warnings -D unreachable-pub --cfg tokio_unstable"

# This must match the entry in rust-toolchain.toml at the repository root
RUSTUP_TOOLCHAIN: "1.81.0"
RUSTUP_TOOLCHAIN: "1.83.0"
on:
pull_request:
merge_group:
Expand Down Expand Up @@ -217,6 +217,8 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: 'true'
- name: Install just
uses: taiki-e/install-action@just
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTUP_TOOLCHAIN }}
Expand All @@ -230,15 +232,10 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: run pedantic clippy on workspace crates
run: |
cargo clippy --all-targets --all-features \
-- --warn clippy::pedantic --warn clippy::arithmetic-side-effects \
--warn clippy::allow_attributes --warn clippy::allow_attributes_without_reason \
--deny warnings
just lint rust-clippy
- name: run pedantic clippy on tools/protobuf-compiler
run: |
cargo clippy --manifest-path tools/protobuf-compiler/Cargo.toml \
--all-targets --all-features \
-- --warn clippy::pedantic --deny warnings
just lint rust-clippy-tools
custom-lints:
runs-on: depot-ubuntu-22.04-8
Expand All @@ -248,16 +245,18 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: 'true'
- name: Install just
uses: taiki-e/install-action@just
- uses: dtolnay/rust-toolchain@master
with:
# This has to match `rust-toolchain` in the rust-toolchain file of the dylint lints
toolchain: nightly-2024-09-05
toolchain: nightly-2024-10-03
components: "clippy, llvm-tools-preview, rustc-dev, rust-src"
- uses: Swatinem/[email protected]
with:
cache-provider: "buildjet"
- name: install cargo-dylint and dylint-link
run: cargo install cargo-dylint@3.2.0 dylint-link@3.2.0 --locked
run: cargo install cargo-dylint@3.3.0 dylint-link@3.3.0 --locked
- uses: arduino/setup-protoc@v3
with:
version: "24.4"
Expand All @@ -266,17 +265,15 @@ jobs:
run: |
: # list all lint packages here to have clippy explicitly test them
: # uses the same nightly installed above to work around the entry in rust-toolchain.toml
cargo +nightly-2024-09-05 clippy --all-targets --all-features \
-p tracing_debug_field \
-- --warn clippy::pedantic --deny warnings
just lint rust-clippy-custom
- name: run dylint clippy on workspace crates
env:
# set the dylint driver path to the target/ directory so that it's hopefully cached by rust-cache
DYLINT_DRIVER_PATH: ${{ github.workspace }}/target/dylint_drivers/
DYLINT_RUSTFLAGS: "-D warnings"
run: |
mkdir -p "$DYLINT_DRIVER_PATH"
cargo dylint --all --workspace
just lint rust-dylint
test:
if: ${{ always() && !cancelled() }}
Expand Down
49 changes: 38 additions & 11 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
* @joroshiba @SuperFluffy @noot
* @joroshiba

*.snap @joroshiba
astria-bridge-contracts/ @SuperFluffy @joroshiba
astria-bridge-withdrawer/ @SuperFluffy @joroshiba
astria-build-info/ @SuperFluffy @joroshiba
astria-cli/ @SuperFluffy @joroshiba
astria-composer/ @SuperFluffy @joroshiba
astria-conductor/ @SuperFluffy @ethanoroshiba @joroshiba
astria-config/ @SuperFluffy @joroshiba
astria-core/ @SuperFluffy @fraser999
astria-core-address/ @SuperFluffy @fraser999
astria-core-consts/ @SuperFluffy @fraser999
astria-core-crypto/ @SuperFluffy @fraser999
astria-eyre/ @SuperFluffy @fraser999
astria-grpc-mock/ @SuperFluffy @fraser999
astria-grpc-mock-test/ @SuperFluffy @fraser999
astria-grpc-mock-test-codegen/ @SuperFluffy @fraser999
astria-merkle/ @SuperFluffy @joroshiba
astria-sequencer/ @noot @fraser999
astria-sequencer-client/ @SuperFluffy @fraser999
astria-sequencer-relayer/ @fraser999 @SuperFluffy
astria-sequencer-utils/ @fraser999 @noot
astria-telemetry/ @SuperFluffy @fraser999
astria-test-utils/ @SuperFluffy @joroshiba

tools/astria-address @SuperFluffy @joroshiba
tools/protobuf-compiler @SuperFluffy @joroshiba
tools/solidity-compiler @SuperFluffy @joroshiba

*.snap @joroshiba @SuperFluffy @fraser999

specs/ @astriaorg/engineering
justfile @astriaorg/engineering
Expand All @@ -10,7 +37,9 @@ taplo.toml @astriaorg/engineering
.gitignore @astriaorg/engineering

/.github/ @astriaorg/infra
/containerfiles/ @astriaorg/infra
/.github/workflows/lint.yml @superfluffy @fraser999
/.github/workflows/test.yml @superfluffy @fraser999
/containerfiles/ @superfluffy @fraser999
/charts/ @astriaorg/infra
/dev/ @astriaorg/infra
.dockerignore @astriaorg/infra
Expand All @@ -22,11 +51,9 @@ buf.lock @astriaorg/api-reviewers
buf.yaml @astriaorg/api-reviewers
buf.work.yaml @astriaorg/api-reviewers

*.rs @astriaorg/rust-reviewers
Cargo.toml @astriaorg/rust-reviewers
Cargo.lock @astriaorg/rust-reviewers
rust-toolchain @astriaorg/rust-reviewers
.cargo/ @astriaorg/rust-reviewers
nextest.toml @astriaorg/rust-reviewers
rusfmt.toml @astriaorg/rust-reviewers
crates/*/CHANGELOG.md @astriaorg/rust-reviewers
/Cargo.toml @SuperFluffy @fraser999
/Cargo.lock @SuperFluffy @fraser999
/rust-toolchain @SuperFluffy @fraser999
/.cargo/ @SuperFluffy @fraser999
/nextest.toml @SuperFluffy @fraser999
/rusfmt.toml @SuperFluffy @fraser999
Loading

0 comments on commit 64aad25

Please sign in to comment.