Skip to content

Commit

Permalink
Merge pull request #1 from wcm-io-devops/feature/fix-ci-builds
Browse files Browse the repository at this point in the history
Try to fix compilation issues on cross targets
  • Loading branch information
tobias-richter authored Aug 19, 2024
2 parents ff2141f + e2528c7 commit c4d19c6
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 18 deletions.
38 changes: 21 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Rust Cache
uses: Swatinem/[email protected]

- uses: dtolnay/rust-toolchain@stable
with:
components: clippy
Expand All @@ -33,6 +36,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Rust Cache
uses: Swatinem/[email protected]

- uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt
Expand All @@ -49,7 +55,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: dtolnay/rust-toolchain@stable
- name: Rust Cache
uses: Swatinem/[email protected]

- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt

Expand All @@ -68,31 +77,26 @@ jobs:
include:
- build: linux
os: ubuntu-latest
target: x86_64-unknown-linux-musl
target: x86_64-unknown-linux-gnu

#- build: macos
# os: macos-latest
# target: x86_64-apple-darwin
- build: macos_x86_64
os: macos-latest
target: x86_64-apple-darwin

#- build: windows-gnu
# os: windows-latest
# target: x86_64-pc-windows-gnu
- build: windows-gnu
os: ubuntu-latest
target: x86_64-pc-windows-gnu

steps:
- uses: actions/checkout@v4


- name: Rust Cache
uses: Swatinem/[email protected]

- uses: dtolnay/rust-toolchain@stable
with:
targets: ${{ matrix.target }}

- name: Install ssl
shell: bash
run: |
if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
sudo apt update
sudo apt install libssl-dev -y
fi
- name: Build
uses: actions-rs/cargo@v1
with:
Expand Down
10 changes: 10 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,13 @@ features = [
"fast-rng", # Use a faster (but still sufficiently random) RNG
"macro-diagnostics", # Enable better diagnostics for compile-time UUIDs
]

[package.metadata.cross.target.x86_64-unknown-linux-gnu]
pre-build = [
"apt-get update && apt-get install --assume-yes libssl-dev"
]

[target.x86_64-apple-darwin.dependencies]
openssl = { version = "0.10", features = ["vendored"] }


2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pippo is a fast CLI tool written in Rust for interacting with Adobe Cloud Manage

## Installation

Either download the version you want from the [releases page](https://github.com/wcm-io-devops/pippo-TODO), or install pippo from source:
Either download the version you want from the [releases page](https://github.com/wcm-io-devops/pippo/releases), or install pippo from source:

```bash
cargo install --locked --path .
Expand Down

0 comments on commit c4d19c6

Please sign in to comment.