From b00610e356ec8352691f91f1c2569bfeccaf7585 Mon Sep 17 00:00:00 2001 From: Colt Frederickson Date: Tue, 7 Mar 2023 15:57:11 -0700 Subject: [PATCH] Add arm64 linux to release (#99) * Add arm64 linux to release * Test against arm64 * Don't need target * Bump version to 1.0.6 --- .github/workflows/build.yaml | 23 +++++----- .github/workflows/release.yaml | 81 ++++++++++++++++++---------------- Cargo.toml | 2 +- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2cf4b06..c56f159 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,6 +26,7 @@ jobs: - pinned-musl - pinned-32 - pinned-arm + - pinned-arm64 - stable - beta - nightly @@ -44,6 +45,8 @@ jobs: - build: pinned-arm os: ubuntu-22.04 target: arm-unknown-linux-gnueabihf + - build: pinned-arm64 + os: buildjet-4vcpu-ubuntu-2204-arm - build: stable os: ubuntu-22.04 rust: stable @@ -119,13 +122,13 @@ jobs: name: Docs runs-on: ubuntu-22.04 steps: - - name: Checkout repository - uses: actions/checkout@v3 - - name: Install Rust - uses: dtolnay/rust-toolchain@master - with: - toolchain: stable - - name: Check documentation - env: - RUSTDOCFLAGS: -D warnings - run: cargo doc --no-deps --document-private-items --workspace + - name: Checkout repository + uses: actions/checkout@v3 + - name: Install Rust + uses: dtolnay/rust-toolchain@master + with: + toolchain: stable + - name: Check documentation + env: + RUSTDOCFLAGS: -D warnings + run: cargo doc --no-deps --document-private-items --workspace diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f8db6f5..b0ea1ed 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -27,31 +27,31 @@ jobs: name: create-release runs-on: ubuntu-22.04 # env: - # Set to force version number, e.g., when no tag exists. - # IRONHIDE_VERSION: TEST-0.0.0 + # Set to force version number, e.g., when no tag exists. + # IRONHIDE_VERSION: TEST-0.0.0 outputs: upload_url: ${{ steps.release.outputs.upload_url }} ironhide_version: ${{ env.IRONHIDE_VERSION }} steps: - - name: Get the release version from the tag - shell: bash - if: env.IRONHIDE_VERSION == '' - run: | - # Apparently, this is the right way to get a tag name. Really? - # - # See: https://github.community/t5/GitHub-Actions/How-to-get-just-the-tag-name/m-p/32167/highlight/true#M1027 - echo "IRONHIDE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV - echo "version is: ${{ env.IRONHIDE_VERSION }}" - - name: Create GitHub release - id: release - uses: ncipollo/release-action@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ env.IRONHIDE_VERSION }} - name: ${{ env.IRONHIDE_VERSION }} - allowUpdates: true - draft: true - omitDraftDuringUpdate: true + - name: Get the release version from the tag + shell: bash + if: env.IRONHIDE_VERSION == '' + run: | + # Apparently, this is the right way to get a tag name. Really? + # + # See: https://github.community/t5/GitHub-Actions/How-to-get-just-the-tag-name/m-p/32167/highlight/true#M1027 + echo "IRONHIDE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + echo "version is: ${{ env.IRONHIDE_VERSION }}" + - name: Create GitHub release + id: release + uses: ncipollo/release-action@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ env.IRONHIDE_VERSION }} + name: ${{ env.IRONHIDE_VERSION }} + allowUpdates: true + draft: true + omitDraftDuringUpdate: true build-release: name: build-release @@ -67,11 +67,14 @@ jobs: RUST_BACKTRACE: 1 strategy: matrix: - build: [linux, linux-arm, macos, win-msvc, win-gnu] + build: [linux, linux-arm64, linux-arm, macos, win-msvc, win-gnu] include: - build: linux os: ubuntu-22.04 target: x86_64-unknown-linux-musl + - build: linux-arm64 + os: buildjet-4vcpu-ubuntu-2204-arm + target: aarch64-unknown-linux-gnu - build: linux-arm os: ubuntu-22.04 target: arm-unknown-linux-gnueabihf @@ -167,26 +170,26 @@ jobs: needs: [create-release, build-release] runs-on: ubuntu-22.04 steps: - - name: Un-draft release - uses: ncipollo/release-action@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ needs.create-release.outputs.ironhide_version }} - name: ${{ needs.create-release.outputs.ironhide_version }} - allowUpdates: true - draft: false + - name: Un-draft release + uses: ncipollo/release-action@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ needs.create-release.outputs.ironhide_version }} + name: ${{ needs.create-release.outputs.ironhide_version }} + allowUpdates: true + draft: false crates-release: name: crates.io-release needs: ['build-release'] runs-on: ubuntu-22.04 steps: - - name: Checkout repository - uses: actions/checkout@v3 - - name: Install Rust - uses: dtolnay/rust-toolchain@master - with: - toolchain: stable - - run: cargo publish --token ${CRATES_TOKEN} - env: - CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} + - name: Checkout repository + uses: actions/checkout@v3 + - name: Install Rust + uses: dtolnay/rust-toolchain@master + with: + toolchain: stable + - run: cargo publish --token ${CRATES_TOKEN} + env: + CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} diff --git a/Cargo.toml b/Cargo.toml index 89f173c..d68b398 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ironhide" -version = "1.0.5" +version = "1.0.6" authors = ["IronCore Labs "] categories = ["cryptography"] description = "Tool to easily encrypt and decrypt files to users and groups. Similar to GPG, but usable at scale."