Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/release-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ concurrency:

jobs:
# Build native binaries for the released commit. Runner arch is load-bearing:
# macos-13 is the last Intel image, macos-latest is Apple Silicon. Do not
# "modernize" macos-13 to macos-latest.
# macos-latest is Apple Silicon (aarch64). Intel macOS (x86_64-apple-darwin) is
# not shipped — keep it out of the installer and `pds upgrade` too.
build:
name: Build ${{ matrix.target }}
runs-on: ${{ matrix.runner }}
Expand All @@ -48,9 +48,6 @@ jobs:
- target: x86_64-unknown-linux-gnu
runner: ubuntu-latest
archive: tar.gz
- target: x86_64-apple-darwin
runner: macos-13 # Intel
archive: tar.gz
- target: aarch64-apple-darwin
runner: macos-latest # Apple Silicon
archive: tar.gz
Expand Down
1 change: 0 additions & 1 deletion crates/pseudoscript/src/upgrade.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ fn install(tag: &str, target: &str, tmp: &Path) -> Result<()> {
fn current_target() -> Result<&'static str> {
let target = match (std::env::consts::OS, std::env::consts::ARCH) {
("linux", "x86_64") => "x86_64-unknown-linux-gnu",
("macos", "x86_64") => "x86_64-apple-darwin",
("macos", "aarch64") => "aarch64-apple-darwin",
("windows", "x86_64") => "x86_64-pc-windows-msvc",
(os, arch) => bail!(
Expand Down
7 changes: 6 additions & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ detect_platform() {

# Only targets with a prebuilt release asset are supported.
case "$target" in
x86_64-unknown-linux-gnu|x86_64-apple-darwin|aarch64-apple-darwin) ;;
x86_64-unknown-linux-gnu|aarch64-apple-darwin) ;;
x86_64-apple-darwin)
echo "error: no prebuilt binary for Intel macOS" >&2
echo " build from source: cargo install --git https://github.com/$REPO" >&2
exit 1
;;
aarch64-unknown-linux-gnu)
echo "error: no prebuilt binary for aarch64 Linux" >&2
echo " build from source: cargo install --git https://github.com/$REPO" >&2
Expand Down
Loading