8000 fix: attempt to fix aarch64 linux binaries by martintc · Pull Request #357 · comtrya/comtrya · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: attempt to fix aarch64 linux binaries #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Nov 8, 2023
Merged
6 changes: 3 additions & 3 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
fail-fast: false
matrix:
job:
- { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu }
- { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu, use-cross: true }
- { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu }

- { os: macos-12, target: x86_64-apple-darwin }
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
# target: aarch64-unknown-linux-gnu,
# use-cross: true,
# }
# - { os: ubuntu-22.04, target: aarch64-unknown-linux-gnu, use-cross: true }
- { os: ubuntu-22.04, target: x86_64-unknown-linux-gnu }
# - {
# os: ubuntu-20.04,
Expand Down Expand Up @@ -98,4 +99,4 @@ jobs:
with:
use-cross: ${{ matrix.job.use-cross }}
command: test
args: --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS}}
args: --target=${{ matrix.job.target }} ${{ steps.test-options.outputs.CARGO_TEST_OPTIONS }}
11 changes: 11 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ walkdir = "2.3"
which = "5.0"
whoami = "1.4"

[dependencies.openssl-sys]
version="0.9"
features = ["vendored"]

[target.'cfg(unix)'.dependencies]
uzers = "0.11"

Expand Down
0