From bb1fc9bb6ac797bfb4b9e615c96daaf76a76311a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Tue, 3 Oct 2023 22:02:19 +0200 Subject: [PATCH] ci: try enable color (#3952) * ci: add CARGO_TERM_COLOR=always * ci: revert dedup check since it doesn't always work --- .github/workflows/build-and-upload-binaries.yml | 2 ++ .github/workflows/ci-build-upload-binaries.yml | 2 ++ .github/workflows/ci-build.yml | 4 ++-- .github/workflows/ci-contracts-schema.yml | 2 ++ .github/workflows/ci-contracts-upload-binaries.yml | 2 ++ .github/workflows/ci-contracts.yml | 2 ++ .github/workflows/ci-nym-connect-desktop-rust.yml | 4 ++-- .github/workflows/ci-nym-wallet-rust.yml | 4 ++-- .github/workflows/ci-sdk-wasm.yml | 2 ++ .github/workflows/nightly-build.yml | 2 ++ .github/workflows/nightly-nym-wallet-build.yml | 2 ++ 11 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-upload-binaries.yml b/.github/workflows/build-and-upload-binaries.yml index 54a3fb51d1..ec4366ab61 100644 --- a/.github/workflows/build-and-upload-binaries.yml +++ b/.github/workflows/build-and-upload-binaries.yml @@ -20,6 +20,8 @@ jobs: platform: [ubuntu-20.04] runs-on: ${{ matrix.platform }} + env: + CARGO_TERM_COLOR: always steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/ci-build-upload-binaries.yml b/.github/workflows/ci-build-upload-binaries.yml index e99eaf82bd..d3a84b7600 100644 --- a/.github/workflows/ci-build-upload-binaries.yml +++ b/.github/workflows/ci-build-upload-binaries.yml @@ -42,6 +42,8 @@ jobs: platform: [ubuntu-20.04] runs-on: ${{ matrix.platform }} + env: + CARGO_TERM_COLOR: always # a push event from the origin repo, or a PR from external repo if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }} steps: diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 9483994d7c..febfe13e5a 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -41,11 +41,11 @@ on: jobs: build: runs-on: [ self-hosted, custom-linux ] + env: + CARGO_TERM_COLOR: always # Enable sccache via environment variable # env: # RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache - # a push event from the origin repo, or a PR from external repo - if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }} steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools protobuf-compiler diff --git a/.github/workflows/ci-contracts-schema.yml b/.github/workflows/ci-contracts-schema.yml index c6bb095f50..f02418788e 100644 --- a/.github/workflows/ci-contracts-schema.yml +++ b/.github/workflows/ci-contracts-schema.yml @@ -15,6 +15,8 @@ jobs: check-schema: name: Generate and check schema runs-on: custom-runner-linux + env: + CARGO_TERM_COLOR: always steps: - name: Check out repository code uses: actions/checkout@v2 diff --git a/.github/workflows/ci-contracts-upload-binaries.yml b/.github/workflows/ci-contracts-upload-binaries.yml index f3d6d827cc..147ddf3ff3 100644 --- a/.github/workflows/ci-contracts-upload-binaries.yml +++ b/.github/workflows/ci-contracts-upload-binaries.yml @@ -22,6 +22,8 @@ jobs: platform: [ubuntu-20.04] runs-on: ${{ matrix.platform }} + env: + CARGO_TERM_COLOR: always # a push event from the origin repo, or a PR from external repo if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }} steps: diff --git a/.github/workflows/ci-contracts.yml b/.github/workflows/ci-contracts.yml index f123184802..a88795c313 100644 --- a/.github/workflows/ci-contracts.yml +++ b/.github/workflows/ci-contracts.yml @@ -27,6 +27,8 @@ jobs: # since it's going to be compiled into wasm, there's absolutely # no point in running CI on different OS-es runs-on: ubuntu-20.04 + env: + CARGO_TERM_COLOR: always needs: matrix_prep strategy: fail-fast: false diff --git a/.github/workflows/ci-nym-connect-desktop-rust.yml b/.github/workflows/ci-nym-connect-desktop-rust.yml index 7cdd6f6507..0eea154550 100644 --- a/.github/workflows/ci-nym-connect-desktop-rust.yml +++ b/.github/workflows/ci-nym-connect-desktop-rust.yml @@ -25,10 +25,10 @@ on: jobs: build: runs-on: [self-hosted, custom-linux] + env: + CARGO_TERM_COLOR: always # env: # RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache - # a push event from the origin repo, or a PR from external repo - if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }} steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools libayatana-appindicator3-dev diff --git a/.github/workflows/ci-nym-wallet-rust.yml b/.github/workflows/ci-nym-wallet-rust.yml index 25c5f544d3..6a1f9e2a19 100644 --- a/.github/workflows/ci-nym-wallet-rust.yml +++ b/.github/workflows/ci-nym-wallet-rust.yml @@ -17,10 +17,10 @@ on: jobs: build: runs-on: [ self-hosted, custom-linux ] + env: + CARGO_TERM_COLOR: always # env: # RUSTC_WRAPPER: /home/ubuntu/.cargo/bin/sccache - # a push event from the origin repo, or a PR from external repo - if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'nymtech/nym' }} steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get -y install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev squashfs-tools diff --git a/.github/workflows/ci-sdk-wasm.yml b/.github/workflows/ci-sdk-wasm.yml index 1c3b8adac0..e3f38bcd71 100644 --- a/.github/workflows/ci-sdk-wasm.yml +++ b/.github/workflows/ci-sdk-wasm.yml @@ -10,6 +10,8 @@ on: jobs: wasm: runs-on: [custom-runner-linux] + env: + CARGO_TERM_COLOR: always steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 0f36f8cc0a..16c98ce16d 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -12,6 +12,8 @@ jobs: rust: [stable, beta] os: [custom-linux, windows10, custom-runner-mac-m1] runs-on: ${{ matrix.os }} + env: + CARGO_TERM_COLOR: always continue-on-error: true steps: - name: Install Dependencies (Linux) diff --git a/.github/workflows/nightly-nym-wallet-build.yml b/.github/workflows/nightly-nym-wallet-build.yml index 8a104b8640..5cc954573c 100644 --- a/.github/workflows/nightly-nym-wallet-build.yml +++ b/.github/workflows/nightly-nym-wallet-build.yml @@ -16,6 +16,8 @@ jobs: matrix: os: [custom-linux, macos-latest, windows10] runs-on: ${{ matrix.os }} + env: + CARGO_TERM_COLOR: always continue-on-error: true steps: - name: Check out repository code