diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5730000..91257bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Rust Cache + uses: Swatinem/rust-cache@v2.7.3 + - uses: dtolnay/rust-toolchain@stable with: components: clippy @@ -33,6 +36,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Rust Cache + uses: Swatinem/rust-cache@v2.7.3 + - uses: dtolnay/rust-toolchain@stable with: components: rustfmt @@ -49,7 +55,10 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - name: Rust Cache + uses: Swatinem/rust-cache@v2.7.3 + + - uses: dtolnay/rust-toolchain@nightly with: components: rustfmt @@ -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/rust-cache@v2.7.3 + - 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: diff --git a/Cargo.toml b/Cargo.toml index 2a66331..dd883a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] } + + diff --git a/README.md b/README.md index 5389caf..3409718 100644 --- a/README.md +++ b/README.md @@ -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 .