Skip to content

Commit 435ddae

Browse files
committed
fix linux CI builds
1 parent 9309440 commit 435ddae

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

src/buildallprojects

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@ fi
3535

3636
solution_out="_vpc_/ninja/sdk_everything_${VPC_NINJA_EXTRA_SUFFIX}$VPC_NINJA_BUILD_MODE"
3737

38-
if [[ ! -e "$solution_out.ninja" ]]; then
39-
sudo -n apt-get install libasio-dev
38+
if [ -n "${GITHUB_ACTIONS+x}" ]; then
39+
sudo apt-get install libasio-dev
4040
gh release download --pattern 'Crow*.deb' -R CrowCpp/Crow -O Crow.deb
41-
sudo -n dpkg -i Crow.deb
41+
sudo dpkg -i Crow.deb
4242
rm Crow.deb
43-
43+
fi
44+
45+
if [[ ! -e "$solution_out.ninja" ]]; then
4446
devtools/bin/vpc /tf /linux64 /ninja /define:SOURCESDK ${VPC_EXTRA_ARGS} +everything /mksln "$solution_out"
4547

4648
# Generate compile commands.

src/sdk_container

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,19 @@ function run_in_sniper() {
2626
mod_src_dir_name=$(basename -- "$mod_src_dir")
2727
mod_base_dir=$(dirname -- "$mod_src_dir")
2828

29+
if [ -n "${GITHUB_ACTIONS+x}" ]; then
30+
USERNS=""
31+
else
32+
USERNS="--userns=keep-id"
33+
fi
34+
2935
image="registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest"
3036
echo "Running script inside $image"
3137
# you need a recent version of podman, tested on 5.6
3238
exec podman run \
3339
--env "$check_env=$script_file" \
3440
--env "CCACHE_DIR=${my_ccache_dir}" \
35-
--userns=keep-id \
41+
$USERNS \
3642
--rm -it \
3743
--mount type=bind,\"source="${my_ccache_dir}"\",\"target="${my_ccache_dir}"\" \
3844
--mount type=bind,\"source="${mod_base_dir}"\",\"target="/tc2/"\" \

0 commit comments

Comments
 (0)