Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Experimental wf targets #370

Merged
merged 2 commits into from
Dec 5, 2023
Merged

Experimental wf targets #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
887a40a
vendor openssl
martintc Dec 4, 2023
b3c7089
adjust matric.job to matrix.platform
martintc Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/main2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,39 +78,39 @@ jobs:
os: ubuntu-22.04
target: x86_64-unknown-linux-gnu
bin: comtrya
name: comtry-x86_64-unknown-linux-gnu
name: comtrya-x86_64-unknown-linux-gnu
cross: false
cargo_command: cargo
skip_tests: false
- os_name: Linux-aarch64-gnu
os: ubuntu-22.04
target: aarch64-unknown-linux-gnu
bin: comtrya
name: comtry-aarch64-unknown-linux-gnu
name: comtrya-aarch64-unknown-linux-gnu
cross: false
cargo_command: ./cross
skip_tests: true
- os_name: Windows-x86_64
os: windows-2022
target: x86_64-pc-windows-msvc
bin: comtrya
name: comtry-x86_64-pc-winfows-msvc
name: comtrya-x86_64-pc-winfows-msvc
cross: false
cargo_command: cargo
skip_tests: false
- os_name: macOS-x86_64
os: macos-12
target: x86_64-apple-darwin
bin: comtrya
name: comtry-x86_64-apple-darwin
name: comtrya-x86_64-apple-darwin
cross: false
cargo_command: cargo
skip_tests: false
- os_name: macOS-aarch64
os: macos-12
target: aarch64-apple-darwin
bin: comtrya
name: comtry-aarch64-apple-darwin
name: comtrya-aarch64-apple-darwin
cross: true
cargo_command: ./cross
skip_tests: true
Expand All @@ -130,13 +130,13 @@ jobs:
if: matrix.job.target != 'x86_64-pc-windows-msvc'
shell: bash
run: |
mv target/release/comtrya comtrya-${{ matrix.job.target }}
mv target/release/comtrya ${{ matrix.platform.target }}

- name: Rename Binary.exe
if: matrix.job.target == 'x86_64-pc-windows-msvc'
shell: bash
run: |
mv target/release/comtrya.exe comtrya-${{ matrix.job.target }}.exe
mv target/release/comtrya.exe ${{ matrix.platform.target }}.exe

- name: Upload Artifact
if: matrix.job.target != 'x86_64-pc-windows-msvc'
Expand All @@ -149,7 +149,7 @@ jobs:
generate_release_notes: false
fail_on_unmatched_files: true
files: |
comtrya-${{ matrix.job.target }}
comtrya-${{ matrix.platform.target }}

- name: Upload Artifact.exe
if: matrix.job.target == 'x86_64-pc-windows-msvc'
Expand All @@ -162,7 +162,7 @@ jobs:
generate_release_notes: false
fail_on_unmatched_files: true
files: |
comtrya-${{ matrix.job.target }}.exe
comtrya-${{ matrix.platform.target }}.exe

build-musl:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ flate2 = "1.0.28"
[target.'cfg(unix)'.dependencies]
uzers = "0.11"

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

[dev-dependencies]
tempfile = "3.8"
pretty_assertions = "1.3"
Loading