Skip to content

Commit

Permalink
merge with main
Browse files Browse the repository at this point in the history
  • Loading branch information
elliedavidson committed Sep 21, 2023
2 parents 89a14a3 + 32d9577 commit 702dbd9
Show file tree
Hide file tree
Showing 51 changed files with 1,359 additions and 1,641 deletions.
38 changes: 19 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ jobs:

- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching
with:
shared-key: ""
prefix-key: ${{ matrix.just_variants }}

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y protobuf-compiler
cargo install just
- name: Check
run: just ${{ matrix.just_variants }} check

- name: Build all crates in workspace
run: just ${{ matrix.just_variants }} build

Expand All @@ -53,24 +53,24 @@ jobs:
env:
RUST_BACKTRACE: full

- name: Setup Docker BuildKit (buildx)
if: matrix.just_variants == 'async_std'
uses: docker/setup-buildx-action@v3
# - name: Setup Docker BuildKit (buildx)
# if: matrix.just_variants == 'async_std'
# uses: docker/setup-buildx-action@v3

- name: Login to Github Container Repo
uses: docker/login-action@v3
if: github.event_name != 'pull_request' && matrix.just_variants == 'async_std'
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
# - name: Login to Github Container Repo
# uses: docker/login-action@v3
# if: github.event_name != 'pull_request' && matrix.just_variants == 'async_std'
# with:
# registry: ghcr.io
# username: ${{ github.repository_owner }}
# password: ${{ secrets.GITHUB_TOKEN }}

- name: Generate docker metadata (web-server)
uses: docker/metadata-action@v5
if: matrix.just_variants == 'async_std'
id: web-server
with:
images: ghcr.io/espressosystems/hotshot/web-server
# - name: Generate docker metadata (web-server)
# uses: docker/metadata-action@v5
# if: matrix.just_variants == 'async_std'
# id: web-server
# with:
# images: ghcr.io/espressosystems/hotshot/web-server

# - name: Build and push web-server docker
# uses: docker/build-push-action@v5
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
lints:
runs-on: ubuntu-latest
timeout-minutes: 25
timeout-minutes: 30
steps:
- uses: styfle/[email protected]
name: Cancel Outdated Builds
Expand All @@ -27,6 +27,12 @@ jobs:
- uses: actions/checkout@v4
name: Checkout Repository

- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching
with:
shared-key: ""
prefix-key: lint

- name: Format Check
run: cargo fmt -- --check

Expand Down
Loading

0 comments on commit 702dbd9

Please sign in to comment.