From 484134670cca982dfdc9cf1af3948572f0d75190 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Fri, 27 Sep 2024 08:25:42 -0500 Subject: [PATCH 1/2] fix: fix broken release pipeline due to bump in rustc / warnings --- .github/workflows/release.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 976d2eaf..88f8a55a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,6 +12,7 @@ on: env: REPO_NAME: ${{ github.repository_owner }}/era-test-node CARGO_TERM_COLOR: always + RUSTFLAGS: "" jobs: extract-version: @@ -59,9 +60,11 @@ jobs: # Builds # ============================== - - name: Install cross v0.2.4 from source + - name: Install cross v0.2.5 from source + env: + RUSTFLAGS: "" run: | - cargo install cross --git https://github.com/cross-rs/cross --tag v0.2.4 + cargo install cross --git https://github.com/cross-rs/cross --tag v0.2.5 - name: Build era-test-node for ${{ matrix.arch }} run: | From 73f9725c0d0ad17504d2b2265f8c87e5d211dcf5 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Fri, 27 Sep 2024 08:48:04 -0500 Subject: [PATCH 2/2] fix: fix broken release pipeline for building aws crate dep --- .github/workflows/release.yml | 4 ++-- Cross.toml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88f8a55a..b3f5e542 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,11 +60,11 @@ jobs: # Builds # ============================== - - name: Install cross v0.2.5 from source + - name: Install cross v0.2.4 from source env: RUSTFLAGS: "" run: | - cargo install cross --git https://github.com/cross-rs/cross --tag v0.2.5 + cargo install cross --git https://github.com/cross-rs/cross --tag v0.2.4 - name: Build era-test-node for ${{ matrix.arch }} run: | diff --git a/Cross.toml b/Cross.toml index 085fc4ee..945834dd 100644 --- a/Cross.toml +++ b/Cross.toml @@ -5,5 +5,8 @@ pre-build = [ "export DEBIAN_FRONTEND=noninteractive", "export TZ=Etc/UTC", "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt update -q && apt upgrade -yq && apt install --assume-yes --no-install-recommends libclang-10-dev clang-10 cmake build-essential pkg-config libssl-dev:$CROSS_DEB_ARCH libsasl2-dev llvm-dev gnutls-bin" + "apt update -q && apt upgrade -yq && apt install --assume-yes --no-install-recommends libclang-10-dev clang-10 cmake build-essential pkg-config libssl-dev:$CROSS_DEB_ARCH libsasl2-dev llvm-dev gnutls-bin", + "apt install -y gcc-10 g++-10", + "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10", + "update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10" ] \ No newline at end of file