Skip to content

Commit

Permalink
Merge branch 'main' into joroshiba/external-ingress-chart
Browse files Browse the repository at this point in the history
  • Loading branch information
joroshiba authored Feb 24, 2025
2 parents 12a0326 + c248d71 commit f782242
Show file tree
Hide file tree
Showing 112 changed files with 7,830 additions and 1,776 deletions.
29 changes: 23 additions & 6 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
required: false
type: choice
options:
- auctioneer
- composer
- conductor
- sequencer
Expand Down Expand Up @@ -39,6 +40,22 @@ jobs:
run_checker:
uses: ./.github/workflows/reusable-run-checker.yml

auctioneer:
needs: run_checker
if: needs.run_checker.outputs.run_docker == 'true' || (github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'auctioneer')
uses: "./.github/workflows/reusable-docker-build.yml"
permissions:
contents: read
id-token: write
packages: write
with:
depot-project-id: 1kp2p2bvbr
package-name: auctioneer
binary-name: auctioneer
tag: ${{ inputs.tag }}
force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'auctioneer' }}
secrets: inherit

composer:
needs: run_checker
if: needs.run_checker.outputs.run_docker == 'true' || (github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'composer')
Expand Down Expand Up @@ -137,7 +154,7 @@ jobs:
smoke-test:
needs: [run_checker, composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli]
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'astriaorg/astria') && (github.event_name == 'merge_group' || needs.run_checker.outputs.run_docker == 'true')
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
steps:
- uses: actions/checkout@v4
- name: Install just
Expand Down Expand Up @@ -169,7 +186,7 @@ jobs:
smoke-cli:
needs: [run_checker, composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli]
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'astriaorg/astria') && (github.event_name == 'merge_group' || needs.run_checker.outputs.run_docker == 'true')
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
steps:
- uses: actions/checkout@v4
- name: Install just
Expand Down Expand Up @@ -201,7 +218,7 @@ jobs:
ibc-bridge-test:
needs: [ run_checker, composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli ]
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'astriaorg/astria') && (github.event_name == 'merge_group' || needs.run_checker.outputs.run_docker == 'true')
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
steps:
- uses: actions/checkout@v4
- name: Install just
Expand Down Expand Up @@ -233,7 +250,7 @@ jobs:
ibc-no-native-asset-test:
needs: [ run_checker, composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli ]
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'astriaorg/astria') && (github.event_name == 'merge_group' || needs.run_checker.outputs.run_docker == 'true')
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
steps:
- uses: actions/checkout@v4
- name: Install just
Expand Down Expand Up @@ -265,7 +282,7 @@ jobs:
ibc-timeout-refund:
needs: [ run_checker, composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli ]
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'astriaorg/astria') && (github.event_name == 'merge_group' || needs.run_checker.outputs.run_docker == 'true')
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
steps:
- uses: actions/checkout@v4
- name: Install just
Expand Down Expand Up @@ -296,7 +313,7 @@ jobs:
docker:
if: ${{ always() && !cancelled() }}
needs: [composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli, smoke-test, smoke-cli, ibc-bridge-test, ibc-no-native-asset-test, ibc-timeout-refund]
needs: [auctioneer, composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli, smoke-test, smoke-cli, ibc-bridge-test, ibc-no-native-asset-test, ibc-timeout-refund]
uses: ./.github/workflows/reusable-success.yml
with:
success: ${{ !contains(needs.*.result, 'failure') }}
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
include:
- target: x86_64-unknown-linux-gnu
os: buildjet-4vcpu-ubuntu-2004
os: depot-ubuntu-24.04-4
build-tool: cargo
- target: aarch64-apple-darwin
os: macos-latest
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
fi
compiles:
runs-on: buildjet-4vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-4
needs: run_checker
if: needs.run_checker.outputs.run_tests == 'true'
steps:
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

rust:
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
needs: run_checker
if: needs.run_checker.outputs.run_tests == 'true'
steps:
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
cargo nextest run --archive-file=archive.tar.zst
rust-ethereum:
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
needs: run_checker
if: needs.run_checker.outputs.run_tests == 'true'
steps:
Expand All @@ -189,7 +189,7 @@ jobs:
cargo nextest run --package astria-bridge-withdrawer -- --include-ignored
doctest:
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
needs: run_checker
if: needs.run_checker.outputs.run_tests == 'true'
steps:
Expand All @@ -210,7 +210,7 @@ jobs:
run: cargo test --doc --all-features

clippy:
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
needs: run_checker
if: needs.run_checker.outputs.run_tests == 'true' && needs.run_checker.outputs.run_lint_rust == 'true'
steps:
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
just lint rust-clippy-tools
custom-lints:
runs-on: buildjet-8vcpu-ubuntu-2204
runs-on: depot-ubuntu-24.04-8
needs: run_checker
if: needs.run_checker.outputs.run_tests == 'true' && needs.run_checker.outputs.run_lint_rust == 'true'
steps:
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
* @joroshiba

astria-auctioneer/ @SuperFluffy @bharath-123
astria-bridge-contracts/ @SuperFluffy @joroshiba
astria-bridge-withdrawer/ @SuperFluffy @joroshiba
astria-build-info/ @SuperFluffy @joroshiba
Expand Down
Loading

0 comments on commit f782242

Please sign in to comment.