From e3ceaa2192dd3d9e8cc9b752ec256081e01e008b Mon Sep 17 00:00:00 2001 From: Todd Martin <33560895+martintc@users.noreply.github.com> Date: Tue, 7 Nov 2023 19:09:19 -0800 Subject: [PATCH] fix: aarch64 binary artifact (#360) attempt to fix aarch64 binary artifact in CI --- .github/workflows/main.yaml | 8 ++++---- .github/workflows/pull-request.yaml | 2 +- lib/Cargo.toml | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 46614c47..a10b61ac 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -73,8 +73,8 @@ jobs: fail-fast: false matrix: job: - - { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu } - - { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu } + - { os: ubuntu-20.04, target: aarch64-unknown-linux-gnu, use-cross: true } + - { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu } - { os: macos-12, target: x86_64-apple-darwin } - { os: macos-12, target: aarch64-apple-darwin } @@ -102,7 +102,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: build - args: --release + args: --release --target=${{ matrix.job.target }} - name: Rename Binary if: matrix.job.target != 'x86_64-pc-windows-msvc' @@ -163,7 +163,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: build - args: --release + args: --release --target=${{ matrix.job.target }} - name: Rename Binary shell: bash diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 526d5ef5..9e7680f3 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -63,7 +63,7 @@ jobs: # target: aarch64-unknown-linux-gnu, # use-cross: true, # } - - { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu } + - { os: ubuntu-20.04, target: x86_64-unknown-linux-gnu } # - { # os: ubuntu-20.04, # target: x86_64-unknown-linux-musl, diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 6ec9f4ee..84be2350 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -42,6 +42,10 @@ whoami = "1.4" [target.'cfg(unix)'.dependencies] uzers = "0.11" +[dependencies.openssl-sys] +version = "0.9" +features = ["vendored"] + [dev-dependencies] tempfile = "3.8" pretty_assertions = "1.3"