Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solaris: Add CI, fix: confstr, uc_lwpid is missing from Solaris 11.4 … #4035

Merged
merged 1 commit into from
Nov 16, 2024
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
28 changes: 28 additions & 0 deletions .github/workflows/full_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,33 @@ jobs:
- name: Execute run-docker.sh
run: sh ./ci/run-docker.sh ${{ matrix.target }}

solaris:
psumbera marked this conversation as resolved.
Show resolved Hide resolved
name: Solaris
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
target:
- x86_64-pc-solaris
steps:
- uses: actions/checkout@v4
- name: test on Solaris
uses: vmactions/solaris-vm@v1
with:
release: "11.4-gcc"
usesh: true
mem: 4096
copyback: false
prepare: |
source <(curl -s https://raw.githubusercontent.com/psumbera/solaris-rust/refs/heads/main/sh.rust-web-install)
echo "~~~~ rustc --version ~~~~"
rustc --version
echo "~~~~ Solaris-version ~~~~"
uname -a
run: |
export PATH=$HOME/.rust_solaris/bin:$PATH
bash ./ci/run.sh ${{ matrix.target }}

check_cfg:
name: "Check #[cfg]s"
runs-on: ubuntu-22.04
Expand All @@ -207,6 +234,7 @@ jobs:
- docker_linux_tier2
- macos
- windows
- solaris
- style_check
- build_channels_linux
- build_channels_macos
Expand Down
3 changes: 3 additions & 0 deletions src/unix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1485,6 +1485,9 @@ cfg_if! {
all(target_os = "macos", target_arch = "x86"),
link_name = "confstr$UNIX2003"
)]
#[cfg_attr(target_os = "solaris",
link_name = "__confstr_xpg7"
)]
pub fn confstr(name: ::c_int, buf: *mut ::c_char, len: ::size_t) -> ::size_t;
}
}
Expand Down
4 changes: 1 addition & 3 deletions src/unix/solarish/x86_64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ s_no_extra_traits! {
#[cfg(target_os = "solaris")]
pub uc_xrs: solaris::xrs_t,
#[cfg(target_os = "solaris")]
pub uc_lwpid: ::c_uint,
#[cfg(target_os = "solaris")]
pub uc_filler: [::c_long; 2],
pub uc_filler: [::c_long; 3],
}
}

Expand Down