From 48833e6f4e9d41d36eb6f48af808458ff6c995ed Mon Sep 17 00:00:00 2001 From: Milap Sheth Date: Fri, 5 Jul 2024 18:46:57 -0400 Subject: [PATCH] clean pin rust version and clean up actions --- .../build-docker-image-and-binaries.yaml | 24 ++++++++++--------- .../workflows/build-latest-docker-image.yaml | 2 +- .github/workflows/format.yaml | 4 ++-- .github/workflows/lint.yaml | 10 ++------ .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- install-gmp-arm64.sh | 6 ----- 7 files changed, 21 insertions(+), 31 deletions(-) delete mode 100755 install-gmp-arm64.sh diff --git a/.github/workflows/build-docker-image-and-binaries.yaml b/.github/workflows/build-docker-image-and-binaries.yaml index ebd75196..ad2eb7fd 100644 --- a/.github/workflows/build-docker-image-and-binaries.yaml +++ b/.github/workflows/build-docker-image-and-binaries.yaml @@ -40,37 +40,39 @@ jobs: aws s3 ls s3://axelar-releases/tofnd/"$SEMVER" && echo "tag already exists, use a new one" && exit 1 - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: '0' ref: ${{ github.event.inputs.tag }} submodules: recursive - - name: Install Rust - run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + - name: Install stable toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: 1.78.0 + override: true + components: rustfmt, clippy - - name: build darwin binaries + - name: Build Mac OS binaries env: SEMVER: ${{ github.event.inputs.tag }} if: matrix.os == 'macos-latest' run: | OS="darwin" ARCH="${{ matrix.arch }}" + mkdir tofndbin if [ "$ARCH" == "arm64" ] then - ./install-gmp-arm64.sh rustup target add aarch64-apple-darwin - cargo build --release --target aarch64-apple-darwin - mkdir tofndbin + cargo build --release --locked --target aarch64-apple-darwin mv /Users/runner/work/tofnd/tofnd/target/aarch64-apple-darwin/release/tofnd "./tofndbin/tofnd-$OS-$ARCH-$SEMVER" else cargo install --locked --path . - mkdir tofndbin mv "/Users/runner/work/tofnd/tofnd/target/release/tofnd" "./tofndbin/tofnd-$OS-$ARCH-$SEMVER" fi - - name: build linux binaries + - name: Build Linux binaries env: SEMVER: ${{ github.event.inputs.tag }} if: matrix.os == 'ubuntu-latest' @@ -147,7 +149,7 @@ jobs: steps: - name: Checkout code for docker image build - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: '0' ref: ${{ github.event.inputs.tag }} diff --git a/.github/workflows/build-latest-docker-image.yaml b/.github/workflows/build-latest-docker-image.yaml index dd9b8d55..3d8715b3 100644 --- a/.github/workflows/build-latest-docker-image.yaml +++ b/.github/workflows/build-latest-docker-image.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout code and submodule - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 94b148e6..ef560801 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive @@ -21,7 +21,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable + toolchain: 1.78.0 override: true components: rustfmt, clippy diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 35765d74..abe81278 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout code and submodule - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive @@ -21,16 +21,10 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable + toolchain: 1.78.0 override: true components: rustfmt, clippy - - name: Run cargo clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --all-targets -- -D warnings - - name: Run cargo clippy with all features uses: actions-rs/cargo@v1 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0dd02c8c..c1b19ad7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3.0.1 + uses: actions/checkout@v4 with: fetch-depth: '0' submodules: recursive diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 20ef0323..2307cd81 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout code and submodule - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive @@ -21,7 +21,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: stable + toolchain: 1.78.0 override: true - name: Run cargo test diff --git a/install-gmp-arm64.sh b/install-gmp-arm64.sh deleted file mode 100755 index 2b3a497c..00000000 --- a/install-gmp-arm64.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -export HOMEBREW_NO_INSTALL_CLEANUP=TRUE -brew uninstall --ignore-dependencies gmp -ARM_DEPENDENCY=$(brew fetch --force --bottle-tag=arm64_big_sur gmp | grep Downloaded | awk '{print $3}') -brew install "$ARM_DEPENDENCY" \ No newline at end of file