Skip to content

Commit 5ac190d

Browse files
committed
sniper again?
1 parent 9d069a2 commit 5ac190d

File tree

1 file changed

+7
-54
lines changed

1 file changed

+7
-54
lines changed

.github/workflows/build-rust.yml

Lines changed: 7 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -16,68 +16,21 @@ jobs:
1616
- name: Build in Steam Runtime container
1717
uses: addnab/docker-run-action@v3
1818
with:
19-
image: registry.gitlab.steamos.cloud/steamrt/scout/sdk
19+
image: registry.gitlab.steamos.cloud/steamrt/sniper/sdk
2020
options: -v ${{ github.workspace }}:/work
2121
run: |
2222
set -ex
23-
24-
# Debug system info
25-
echo "System information:"
26-
uname -a
27-
ldd --version
28-
cat /etc/issue || true
29-
30-
# Check available GCC versions
31-
ls -la /usr/bin/gcc*
32-
gcc-9 --version
33-
3423
apt-get update
35-
apt-get install -y curl build-essential gcc-9 g++-9 wget
36-
37-
# Download and install an older rustup version
38-
mkdir -p ~/.cargo
39-
RUSTUP_VERSION="1.21.1" # An older version that might work with older glibc
40-
wget -O rustup-init "https://raw.githubusercontent.com/rust-lang/rustup/${RUSTUP_VERSION}/rustup-init.sh"
41-
chmod +x rustup-init
42-
43-
# Install Rust with explicit toolchain version
44-
RUSTUP_TOOLCHAIN="1.67.0" # Known to work with older glibc
45-
./rustup-init -y --no-modify-path --default-toolchain $RUSTUP_TOOLCHAIN
46-
export PATH="$HOME/.cargo/bin:$PATH"
47-
48-
# Debug Rust installation
49-
echo "Rust version:"
50-
rustc --version
51-
cargo --version
52-
53-
# Create linker script inside container
54-
cat > /tmp/linker.sh << 'EOL'
55-
#!/bin/bash
56-
echo "Linker args: $@" >&2
57-
for arg do
58-
shift
59-
case $arg in
60-
(-lgcc_s) : ;;
61-
(*) set -- "$@" "$arg" ;;
62-
esac
63-
done
64-
echo "Modified linker args: $@" >&2
65-
exec "$CC" "$@" -lgcc
66-
EOL
67-
chmod +x /tmp/linker.sh
68-
69-
# Setup modern GCC with debug output
70-
export CC=gcc-9
71-
export CXX=g++-9
72-
echo "CC version: $($CC --version)"
24+
apt-get install -y curl build-essential
7325
74-
# Configure Rust to use our linker script with verbose output
75-
export RUSTFLAGS="-C linker=/tmp/linker.sh -C link-arg=-v"
26+
# Install Rust
27+
curl --proto '=https' -sSf https://sh.rustup.rs | sh -s -- -y
28+
. "$HOME/.cargo/env"
7629
7730
cd /work/lib
78-
# Build with more verbose output
79-
RUST_BACKTRACE=1 cargo build -vv --release
31+
cargo build --release
8032
33+
# Copy built library
8134
mkdir -p /work/artifacts
8235
cp target/release/libdmi.so /work/artifacts/
8336

0 commit comments

Comments
 (0)