diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62990ad..a68125d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,8 @@ name: release on: push: - # tags: - # - "v*" + tags: + - "v*" jobs: build: @@ -16,24 +16,37 @@ jobs: include: - target: x86_64-unknown-linux-musl os: ubuntu-latest - uname: linux - target: x86_64-apple-darwin - os: ubuntu-latest - uname: darwin + os: macos-latest runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 - - name: Build + - name: Build Linux + if: matrix.os == 'ubuntu-latest' run: | docker run --rm -t \ -v $HOME/.cargo/registry/:/root/.cargo/registry \ - -v "$(pwd)":/root/src \ - joseluisq/rust-linux-darwin-builder:1.46.0 \ - sh -c 'cargo build --release --target ${{ matrix.target }}' + -v "$(pwd)":/volume \ + clux/muslrust:nightly \ + cargo build --release --target ${{ matrix.target }} + - name: Prepare macOS + if: matrix.os == 'macos-latest' + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + target: ${{ matrix.target }} + override: true + - name: Build macOS + if: matrix.os == 'macos-latest' + uses: actions-rs/cargo@v1 + with: + toolchain: nightly + command: build + args: --release --target ${{ matrix.target }} - name: Upload uses: actions/upload-artifact@v2 with: - name: vaultsign-${{ matrix.uname }}-amd64 + name: vaultsign-${{ matrix.os }}-amd64 path: target/${{ matrix.target }}/release/vaultsign if-no-files-found: error @@ -46,9 +59,9 @@ jobs: uses: actions/download-artifact@v2 - name: Layout run: | - mv vaultsign-linux-amd64/vaultsign ./vaultsign-linux-amd64 - mv vaultsign-darwin-amd64/vaultsign ./vaultsign-darwin-amd64 - rm -rf vaultsign-linux-amd64 vaultsign-darwin-amd64 + mv vaultsign-ubuntu-latest-amd64/vaultsign ./vaultsign-linux-amd64 + mv vaultsign-macos-latest-amd64/vaultsign ./vaultsign-darwin-amd64 + rm -rf vaultsign-ubuntu-latest-amd64 vaultsign-macos-latest-amd64 - name: Checksum run: make SHA256SUMS - name: Create Release diff --git a/Cargo.toml b/Cargo.toml index 5f237e9..e3a6c78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,4 @@ -# cargo-features = ["strip"] +cargo-features = ["strip"] [package] name = "vaultsign" @@ -23,5 +23,5 @@ serde = { version = "1.0.116", features = ["derive"] } serde_json = "1.0.57" tokio = { version = "0.2.2", features = ["macros"] } -# [profile.release] -# strip = "symbols" +[profile.release] +strip = "symbols" diff --git a/README.org b/README.org index 685e068..6a13b2b 100644 --- a/README.org +++ b/README.org @@ -173,7 +173,11 @@ nix-shell --pure --run "make release" Otherwise, any sufficiently modern Rust toolchain should be able to compile =vaultsign=. #+BEGIN_QUOTE -NOTE: =vaultsign= links against your system's native OpenSSL distribution. Ensure you have the dependencies listed in [[shell.nix][shell.nix]]. +NOTE: regarding OpenSSL. + +If you are compiling from source, =vaultsign= links against your system's native OpenSSL distribution. Ensure you have the dependencies listed in [[shell.nix][shell.nix]]. + +If you are using the pre-compiled Darwin version from the [[https://github.com/martinbaillie/vaultsign/releases/][releases]] section then it is not static so ensure you have OpenSSL version 1.1 installed. #+END_QUOTE * GitHub Verification If you want that coveted GitHub green verified tick for your Vault-signed