Skip to content
Draft
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
5 changes: 5 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
[alias]
xtask = "run --package xtask --"

[target.aarch64-pc-windows-msvc]
rustflags = [
"-C", "link-args=/STACK:8388608",
]

[target.x86_64-pc-windows-msvc]
rustflags = [
"-C", "link-args=/STACK:8388608",
Expand Down
14 changes: 14 additions & 0 deletions .github/build-setup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Install `perl-IPC-Cmd` on manylinux as required to build OpenSSL.
- name: Install perl-IPC-Cmd on manylinux
if: contains(matrix.container.image, 'manylinux')
run: |
yum install -y perl-IPC-Cmd perl-Time-Piece
git config --global --add safe.directory /__w/oxide.rs/oxide.rs
# The windows-11-arm image's rustup defaults to an x86_64 host -- force it to be
# aarch64-pc-windows-msvc.
- name: Use native aarch64 Rust toolchain on Windows ARM64
if: runner.os == 'Windows' && runner.arch == 'ARM64'
shell: bash
run: |
rustup set default-host aarch64-pc-windows-msvc
rustc -vV
5 changes: 0 additions & 5 deletions .github/manylinux.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ jobs:
run: |
yum install -y perl-IPC-Cmd perl-Time-Piece
git config --global --add safe.directory /__w/oxide.rs/oxide.rs
- name: "Use native aarch64 Rust toolchain on Windows ARM64"
if: "runner.os == 'Windows' && runner.arch == 'ARM64'"
run: |
rustup set default-host aarch64-pc-windows-msvc
rustc -vV
shell: "bash"
- name: Install dist
run: ${{ matrix.install_dist.run }}
# Get the dist-manifest
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,22 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, windows-2022, macos-latest]
os: [ubuntu-22.04, windows-2022, windows-11-arm, macos-latest]
features: [ all, default ]
include:
- features: all
feature_flags: --all-features
steps:
- uses: actions/checkout@v4
# TODO-RAINCLAUDE: without this, windows-11-arm builds and tests an emulated x64 binary; keep in sync with .github/build-setup.yml
- name: Use native aarch64 Rust toolchain on Windows ARM64
if: runner.os == 'Windows' && runner.arch == 'ARM64'
shell: bash
run: rustup set default-host aarch64-pc-windows-msvc
- name: Report cargo version
run: cargo --version
- name: Report rustc version
run: rustc --version
run: rustc -vV
- name: Build
run: cargo build ${{ matrix.feature_flags }} --locked --all-targets --verbose
- name: Run tests
Expand Down
9 changes: 5 additions & 4 deletions dist-workspace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ ci = "github"
# The installers to generate for each app
installers = []
# Target platforms to build apps for (Rust target-triple syntax)
targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
targets = ["aarch64-apple-darwin", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-pc-windows-msvc", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
# Which actions to run on pull requests
pr-run-mode = "plan"
# Install `perl-IPC-Cmd` on manylinux as required to build OpenSSL
github-build-setup = "../manylinux.yml"
# See .github/build-setup.yml for what this does.
github-build-setup = "../build-setup.yml"
# Whether to sign macOS executables
macos-sign = true
# Whether to sign Windows executables
Expand All @@ -35,5 +35,6 @@ image = "quay.io/pypa/manylinux_2_28_x86_64"
host = "x86_64-unknown-linux-musl"

[dist.github-custom-runners]
x86_64-apple-darwin = "macos-14"
aarch64-apple-darwin = "macos-14"
aarch64-pc-windows-msvc = "windows-11-arm"
x86_64-apple-darwin = "macos-14"
Comment on lines 38 to +40

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alphabetized this and the list above.

Loading