diff options
author | nickelc <constantin.nickel@gmail.com> | 2023-06-03 12:44:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-03 06:44:29 -0400 |
commit | d327bad4d52813c289b58650ce4d2bbf2074c0c4 (patch) | |
tree | 193dc2ea2b931c062ab12c81a93afacf0f36c45b | |
parent | dda9a87421a2590ed3a37637ab1d956fd5083af1 (diff) |
Fix typo in publishing build job & restore cross-compilation (#1430)
* Fix typo in publishing build job
This prevented the cross-compilation targets from using the `cross`
binary for the compilation.
The script evaluated with `${{ matrix.job.cross }}` to:
```
if [[ "" == "true" ]]; then
cross build --release --target x86_64-unknown-linux-musl
else
cargo build --release --target x86_64-unknown-linux-musl
fi
```
The correct result for `${{ matrix.job.use-cross }}` is:
```
if [[ "true" == "true" ]]; then
cross build --release --target x86_64-unknown-linux-musl
else
cargo build --release --target x86_64-unknown-linux-musl
fi
```
* Restore previously failed cross-compilation targets
- Revert "Delete the remaining failing cross-compilation target"
This reverts commit 2937f3277a10d660bdb920ee6d5b9f033f6d97ef.
- Revert "Delete another failing cross-compilation target"
This reverts commit 4af8adf580818b57baa062bb7cd89a1cb72f1fbb.
- Revert "Delete i686-unknown-linux-gnu job"
This reverts commit eebddddb0a8c41f1225d9cd9a50d70128642623f.
- Revert "Delete arm-unknown-linux-gnueabihf job"
This reverts commit 9a2fa348eb4470a73790cc24320f1964783264c4.
-rw-r--r-- | .github/workflows/cd.yml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b292e9cb..562206e9 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -24,6 +24,18 @@ jobs: - os: ubuntu-latest target: x86_64-unknown-linux-gnu use-cross: false + - os: ubuntu-latest + target: x86_64-unknown-linux-musl + use-cross: true + - os: ubuntu-latest + target: i686-unknown-linux-gnu + use-cross: true + - os: ubuntu-latest + target: arm-unknown-linux-gnueabihf + use-cross: true + - os: ubuntu-latest + target: aarch64-unknown-linux-gnu + use-cross: true steps: - name: Installing Rust toolchain @@ -42,7 +54,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: 10.7 shell: bash run: | - if [[ "${{ matrix.job.cross }}" == "true" ]]; then + if [[ "${{ matrix.job.use-cross }}" == "true" ]]; then cross build --release --target ${{ matrix.job.target }} else cargo build --release --target ${{ matrix.job.target }} |