Skip to content

Commit

Permalink
go back to using shell script launcher on mac and linux
Browse files Browse the repository at this point in the history
intel binary on aarch64 causes downstream software to mis-diagnose the platform and all heck breaks loose.

on mac, building a universal binary will solve this: rust-lang/cargo#8875
  • Loading branch information
jjallaire authored Sep 6, 2022
1 parent c5967cc commit 5fd088e
Showing 1 changed file with 3 additions and 36 deletions.
39 changes: 3 additions & 36 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,6 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.63.0
override: true
components: rustfmt, clippy

- name: Configure
run: |
Expand All @@ -99,13 +94,7 @@ jobs:
pushd package/src/
./quarto-bld prepare-dist --set-version ${{needs.configure.outputs.version}} --log-level info
popd
# https://stackoverflow.com/questions/58526782/how-can-i-create-a-static-executable-with-rustc-using-glibc-instead-of-musl
- name: Build Launcher
run: |
RUSTFLAGS="-C target-feature=+crt-static" cargo build --target x86_64-unknown-linux-gnu --release --manifest-path package/launcher/Cargo.toml
cp package/launcher/target/x86_64-unknown-linux-gnu/release/quarto package/dist/bin/quarto
- name: Make Tarball
run: |
pushd package/
Expand All @@ -126,12 +115,7 @@ jobs:
needs: [configure]

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.63.0
override: true
components: rustfmt, clippy
- uses: actions/checkout@v2

- name: Configure
run: |
Expand All @@ -143,12 +127,6 @@ jobs:
./quarto-bld prepare-dist --set-version ${{needs.configure.outputs.version}} --log-level info
popd
# https://stackoverflow.com/questions/58526782/how-can-i-create-a-static-executable-with-rustc-using-glibc-instead-of-musl
- name: Build Launcher
run: |
RUSTFLAGS="-C target-feature=+crt-static" cargo build --target x86_64-unknown-linux-gnu --release --manifest-path package/launcher/Cargo.toml
cp package/launcher/target/x86_64-unknown-linux-gnu/release/quarto package/dist/bin/quarto
- name: Make Installer
run: |
pushd package/src/
Expand Down Expand Up @@ -249,12 +227,7 @@ jobs:
needs: [configure]

steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.63.0
override: true
components: rustfmt, clippy
- uses: actions/checkout@v2

- name: Configure
run: |
Expand Down Expand Up @@ -284,12 +257,6 @@ jobs:
./quarto-bld prepare-dist --set-version ${{needs.configure.outputs.version}} --log-level info
popd
- name: Build Launcher
run: |
cargo build --release --all-features --manifest-path package/launcher/Cargo.toml
mkdir -p package/dist/bin
cp package/launcher/target/release/quarto package/dist/bin/quarto
- name: Make Installer
run: |
pushd package/src/
Expand Down

0 comments on commit 5fd088e

Please sign in to comment.