Skip to content

Commit 5fd088e

Browse files
authored
go back to using shell script launcher on mac and linux
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
1 parent c5967cc commit 5fd088e

File tree

1 file changed

+3
-36
lines changed

1 file changed

+3
-36
lines changed

.github/workflows/create-release.yml

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ jobs:
8484

8585
steps:
8686
- uses: actions/checkout@v2
87-
- uses: actions-rs/toolchain@v1
88-
with:
89-
toolchain: 1.63.0
90-
override: true
91-
components: rustfmt, clippy
9287

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

128117
steps:
129-
- uses: actions/checkout@v2
130-
- uses: actions-rs/toolchain@v1
131-
with:
132-
toolchain: 1.63.0
133-
override: true
134-
components: rustfmt, clippy
118+
- uses: actions/checkout@v2
135119

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

251229
steps:
252-
- uses: actions/checkout@v2
253-
- uses: actions-rs/toolchain@v1
254-
with:
255-
toolchain: 1.63.0
256-
override: true
257-
components: rustfmt, clippy
230+
- uses: actions/checkout@v2
258231

259232
- name: Configure
260233
run: |
@@ -284,12 +257,6 @@ jobs:
284257
./quarto-bld prepare-dist --set-version ${{needs.configure.outputs.version}} --log-level info
285258
popd
286259
287-
- name: Build Launcher
288-
run: |
289-
cargo build --release --all-features --manifest-path package/launcher/Cargo.toml
290-
mkdir -p package/dist/bin
291-
cp package/launcher/target/release/quarto package/dist/bin/quarto
292-
293260
- name: Make Installer
294261
run: |
295262
pushd package/src/

0 commit comments

Comments
 (0)