build: update to dev-env with SDK 0.13 and LLVM 12 (flybywiresim#4960)

Mickepilot · May 31, 2021 · b463228 · b463228
1 parent 5e0c0dc
commit b463228
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 84 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -2,8 +2,23 @@
 
 set -ex
 
+# store current file ownership
+ORIGINAL_USER_ID=$(stat -c '%u' /external)
+ORIGINAL_GROUP_ID=$(stat -c '%g' /external)
+
+# set ownership to root to fix cargo/rust build (when run as github action)
+if [ "${GITHUB_ACTIONS}" == "true" ]; then
+  chown -R root:root /external
+fi
+
+# run build
 if [ "$1" = "--no-tty"  ]; then
     npx igniter --no-tty
 else
     npx igniter
 fi
+
+# restore ownership (when run as github action)
+if [ "${GITHUB_ACTIONS}" == "true" ]; then
+  chown -R ${ORIGINAL_USER_ID}:${ORIGINAL_GROUP_ID} /external
+fi
diff --git a/scripts/dev-env/run.cmd b/scripts/dev-env/run.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set image="ghcr.io/flybywiresim/dev-env@sha256:0bf0844b914cbd45a8a0a866a71c7a07fa09308f48cb961708be479f0d63aa0f"
+set image="ghcr.io/flybywiresim/dev-env@sha256:626f12e8f5ca0517f39fc2b046eb91036998803b7cd483482581447d07e4ae7d"
 
 docker image inspect %image% 1> nul || docker system prune --filter label=flybywiresim=true -f
 docker run --rm -it -v "%cd%:/external" %image% %*
diff --git a/scripts/dev-env/run.sh b/scripts/dev-env/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-IMAGE="ghcr.io/flybywiresim/dev-env@sha256:0bf0844b914cbd45a8a0a866a71c7a07fa09308f48cb961708be479f0d63aa0f"
+IMAGE="ghcr.io/flybywiresim/dev-env@sha256:626f12e8f5ca0517f39fc2b046eb91036998803b7cd483482581447d07e4ae7d"
 
 # only set `-it` if there is a tty
 if [ -t 0 ] && [ -t 1 ];
@@ -15,6 +15,7 @@ docker image inspect $IMAGE 1> /dev/null || docker system prune --filter label=f
 
 docker run \
     --rm $TTY_PARAM \
+    -e GITHUB_ACTIONS="${GITHUB_ACTIONS}" \
     -e GITHUB_ACTOR="${GITHUB_ACTOR}" \
     -e GITHUB_REF="${GITHUB_REF}" \
     -e GITHUB_SHA="${GITHUB_SHA}" \

diff --git a/src/fadec/build.sh b/src/fadec/build.sh
@@ -19,6 +19,7 @@ clang++ \
   -D_LIBCPP_HAS_NO_THREADS \
   -D_WINDLL \
   -D_MBCS \
+  -mthread-model single \
   -fno-exceptions \
   -fms-extensions \
   -fvisibility=hidden \

diff --git a/src/fbw/build.sh b/src/fbw/build.sh
@@ -23,6 +23,7 @@ clang \
   -D_LIBCPP_HAS_NO_THREADS \
   -D_WINDLL \
   -D_MBCS \
+  -mthread-model single \
   -fno-exceptions \
   -fms-extensions \
   -fvisibility=hidden \
@@ -57,6 +58,7 @@ clang++ \
   -D_LIBCPP_HAS_NO_THREADS \
   -D_WINDLL \
   -D_MBCS \
+  -mthread-model single \
   -fno-exceptions \
   -fms-extensions \
   -fvisibility=hidden \

diff --git a/src/systems/a320_systems/src/lib.rs b/src/systems/a320_systems/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::suspicious_operation_groupings)]
+
 mod electrical;
 mod fuel;
 mod hydraulic;

diff --git a/src/systems/systems/src/lib.rs b/src/systems/systems/src/lib.rs
@@ -4,6 +4,7 @@
 //! Throughout type names and documentation:
 //! - **Simulator** refers to the simulator you integrate with, such as MSFS.
 //! - **Simulation** refers to the system simulation you create by using this crate.
+#![allow(clippy::suspicious_operation_groupings)]
 #[macro_use]
 mod macros;