From 83a223746016dd50e456d770017a94b9008b2ea9 Mon Sep 17 00:00:00 2001 From: John Cairns Date: Fri, 26 Jan 2024 16:26:12 -0600 Subject: [PATCH] 46, 47: force prod ci build, upgrade codecov plugin --- .github/workflows/ci-image.yml | 14 ++++++++++++-- .github/workflows/coverage.yml | 8 +------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-image.yml b/.github/workflows/ci-image.yml index d058d64..65d4958 100644 --- a/.github/workflows/ci-image.yml +++ b/.github/workflows/ci-image.yml @@ -22,13 +22,23 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Build and Push + - name: Build CI + uses: docker/build-push-action@v3 + with: + context: . + platforms: linux/amd64 + push: false + build-args: | + VERSION=latest + CARGO_INCREMENTAL=0 + - name: Build Prod CI uses: docker/build-push-action@v3 with: context: . + file: prod/Dockerfile platforms: linux/amd64 push: false build-args: | VERSION=latest CARGO_INCREMENTAL=0 + diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d47249e..8584998 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -7,18 +7,12 @@ jobs: - uses: actions/checkout@v2 - name: Install Rust run: rustup toolchain install nightly --component llvm-tools-preview - - name: Install anvil - uses: baptiste0928/cargo-install@v2 - with: - crate: anvil - git: https://github.com/foundry-rs/foundry - commit: nightly - name: Install cargo-llvm-cov run: curl -LsSf https://github.com/taiki-e/cargo-llvm-cov/releases/latest/download/cargo-llvm-cov-x86_64-unknown-linux-gnu.tar.gz | tar xzf - -C ~/.cargo/bin - name: Generate code coverage run: RUST_LOG=xps_gateway=info,registry=info,inbox=info,messaging=info,gateway_types=info cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} files: lcov.info