From 682f5c68cefd2e1fefdd380860651ea84ec33164 Mon Sep 17 00:00:00 2001 From: Talal Ashraf Date: Mon, 15 Apr 2024 23:06:01 +0500 Subject: [PATCH 1/2] chore(infra): backport runner updates (#322) * chore(devops): upgrade runners to ubuntu latest (#315) * bump version to v0.10.4 --- .../build-docker-image-and-binaries.yaml | 31 ++++++++++++------- .../workflows/build-latest-docker-image.yaml | 2 +- .github/workflows/format.yaml | 4 +-- .github/workflows/lint.yaml | 4 +-- .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 4 +-- Cargo.toml | 2 +- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-docker-image-and-binaries.yaml b/.github/workflows/build-docker-image-and-binaries.yaml index 68c919b5..b5f66e87 100644 --- a/.github/workflows/build-docker-image-and-binaries.yaml +++ b/.github/workflows/build-docker-image-and-binaries.yaml @@ -13,8 +13,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, macos-latest] + os: [ubuntu-latest, macos-latest] arch: [amd64, arm64] + exclude: + - {os: "ubuntu-latest", arch: "arm64"} permissions: contents: write @@ -37,7 +39,7 @@ jobs: if [[ $SEMVER =~ v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} ]]; then echo "Tag is okay" && exit 0; else echo "invalid tag" && exit 1; fi aws s3 ls s3://axelar-releases/tofnd/"$SEMVER" && echo "tag already exists, use a new one" && exit 1 - - name: Checkout code + - name: Checkout code uses: actions/checkout@v2 with: fetch-depth: '0' @@ -60,10 +62,17 @@ jobs: OS="darwin" TOFND_PATH="/Users/runner/work/tofnd/tofnd/target/release" fi + + - name: build linux binaries + env: + SEMVER: ${{ github.event.inputs.tag }} + if: matrix.os == 'ubuntu-latest' + run: | + OS="linux" ARCH="${{ matrix.arch }}" cargo install --locked --path . mkdir tofndbin - mv "$TOFND_PATH/tofnd" "./tofndbin/tofnd-$OS-$ARCH-$SEMVER" + mv "$TOFND_PATH/tofnd" "./tofndbin/tofnd-$OS-$ARCH-$SEMVER" - name: Test tofnd version working-directory: ./tofndbin @@ -88,7 +97,7 @@ jobs: else OS="darwin" fi - ARCH="${{ matrix.arch }}" + ARCH="${{ matrix.arch }}" gpg --armor --detach-sign tofnd-"$OS"-"$ARCH"-"$SEMVER" - name: Create zip and sha256 files @@ -121,7 +130,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04] + os: [ubuntu-latest] permissions: contents: write @@ -138,35 +147,35 @@ jobs: submodules: recursive - name: Install Cosign - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-latest' uses: sigstore/cosign-installer@main - name: Install SSH key - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-latest' uses: webfactory/ssh-agent@v0.4.1 with: ssh-private-key: ${{ secrets.CICD_RSA_KEY }} - name: Build docker image - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-latest' run: | make docker-image - name: Login to DockerHub - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-latest' uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_TOKEN }} - name: Push to DockerHub (release) - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-latest' run: | docker tag axelar/tofnd:latest axelarnet/tofnd:${{ github.event.inputs.tag }} docker push axelarnet/tofnd:${{ github.event.inputs.tag }} - name: Sign the images with GitHub OIDC - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-latest' run: cosign sign --oidc-issuer https://token.actions.githubusercontent.com ${TAGS} env: TAGS: axelarnet/tofnd:${{ github.event.inputs.tag }} diff --git a/.github/workflows/build-latest-docker-image.yaml b/.github/workflows/build-latest-docker-image.yaml index 8d987151..7871a67f 100644 --- a/.github/workflows/build-latest-docker-image.yaml +++ b/.github/workflows/build-latest-docker-image.yaml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: - - ubuntu-18.04 + - ubuntu-latest runs-on: ${{ matrix.os }} steps: - name: Checkout code and submodule diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 90d4ec2e..39559da1 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -8,8 +8,8 @@ jobs: strategy: matrix: os: - # - ubuntu-18.04 - - macos-10.15 + # - ubuntu-18.04 + - macos-10.15 runs-on: ${{ matrix.os }} steps: - name: Checkout code diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 29a5ac45..28c26ff5 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -8,8 +8,8 @@ jobs: strategy: matrix: os: - # - ubuntu-18.04 - - macos-10.15 + # - ubuntu-latest + - macos-latest runs-on: ${{ matrix.os }} steps: - name: Checkout code and submodule diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 20f02273..0dd02c8c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ on: jobs: release: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3.0.1 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 42071750..9e3dfa80 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,8 +8,8 @@ jobs: strategy: matrix: os: - # - ubuntu-18.04 - - macos-10.15 + # - ubuntu-latest + - macos-latest runs-on: ${{ matrix.os }} steps: - name: Checkout code and submodule diff --git a/Cargo.toml b/Cargo.toml index a3efce8c..00267cb0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tofnd" -version = "0.10.3" +version = "0.10.4" authors = ["Gus Gutoski ", "Stelios Daveas "] edition = "2018" license = "MIT OR Apache-2.0" From 0646a37fc387455f15cf300b6e69c6819ceb7056 Mon Sep 17 00:00:00 2001 From: axelar-cicd-bot Date: Mon, 15 Apr 2024 18:07:04 +0000 Subject: [PATCH 2/2] v0.10.4