Skip to content

Commit

Permalink
Merge branch 'releases/0.10.x' into talal/backport-rust-lock
Browse files Browse the repository at this point in the history
  • Loading branch information
Talal Ashraf authored May 30, 2024
2 parents d21c657 + 0646a37 commit 608e746
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 16 deletions.
31 changes: 20 additions & 11 deletions .github/workflows/build-docker-image-and-binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -121,7 +130,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04]
os: [ubuntu-latest]

permissions:
contents: write
Expand All @@ -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/[email protected]
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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-latest-docker-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-18.04
- ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code and submodule
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
release:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tofnd"
version = "0.10.3"
version = "0.10.4"
authors = ["Gus Gutoski <[email protected]>", "Stelios Daveas <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand Down

0 comments on commit 608e746

Please sign in to comment.