From 328036f3b8c98c421417670481df9f0fb80ec2e5 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 1 Dec 2022 09:22:05 +0100 Subject: [PATCH 1/4] Fixed building doc with only llcm13 installed --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 1b60028e05d..68821bb4283 100644 --- a/Makefile +++ b/Makefile @@ -130,6 +130,8 @@ else ifeq ($(ENABLE_LLVM), 1) else ifneq (, $(shell which llvm-config-13 2>/dev/null)) LLVM_VERSION := $(shell llvm-config-13 --version) compilers += llvm + # need force LLVM_SYS_120_PREFIX, or llvm_sys will not build in the case + export LLVM_SYS_120_PREFIX = $(shell llvm-config-13 --prefix) else ifneq (, $(shell which llvm-config-12 2>/dev/null)) LLVM_VERSION := $(shell llvm-config-12 --version) compilers += llvm From 7ffd08668e08ac8ff3680f76b4d288f50bb263b4 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 1 Dec 2022 09:31:40 +0100 Subject: [PATCH 2/4] Fixed minimal-sys build --- lib/api/src/sys/store.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/api/src/sys/store.rs b/lib/api/src/sys/store.rs index 65901c2dc82..612652014a2 100644 --- a/lib/api/src/sys/store.rs +++ b/lib/api/src/sys/store.rs @@ -197,24 +197,28 @@ impl AsStoreMut for Store { } } +#[cfg(feature = "compiler")] impl AsEngineRef for Store { fn as_engine_ref(&self) -> EngineRef<'_> { EngineRef::new(&self.engine) } } +#[cfg(feature = "compiler")] impl AsEngineRef for &Store { fn as_engine_ref(&self) -> EngineRef<'_> { EngineRef::new(&self.engine) } } +#[cfg(feature = "compiler")] impl AsEngineRef for StoreRef<'_> { fn as_engine_ref(&self) -> EngineRef<'_> { EngineRef::new(&self.inner.engine) } } +#[cfg(feature = "compiler")] impl AsEngineRef for StoreMut<'_> { fn as_engine_ref(&self) -> EngineRef<'_> { EngineRef::new(&self.inner.engine) From 9142dfec5caf1935e4c0aba6a95faafd711658ae Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 1 Dec 2022 09:36:07 +0100 Subject: [PATCH 3/4] [CI] Add libncurses5 to linux-x64 build system --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be8ae0880ca..2320b12a949 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,10 +89,12 @@ jobs: - uses: actions/checkout@v3 - name: Set up libstdc++ on Linux if: matrix.build == 'linux-x64' + #llvm needs libtinfo5, and it seems it's not by default in the system now run: | sudo apt-get update -y sudo apt-get install -y --allow-downgrades libstdc++6=8.4.0-1ubuntu1~18.04 sudo apt-get install --reinstall g++-8 + sudo apt-get install -y libncurses5 - name: Set up base deps on musl if: matrix.build == 'linux-musl-x64' run: | From ae6ffb2bed072761ff4cc85350ee5c63c7a9f1a1 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 1 Dec 2022 09:44:25 +0100 Subject: [PATCH 4/4] Reverted last commit and use same OS setup for lint as for build --- .github/workflows/build.yml | 2 -- .github/workflows/lint.yaml | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2320b12a949..be8ae0880ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,12 +89,10 @@ jobs: - uses: actions/checkout@v3 - name: Set up libstdc++ on Linux if: matrix.build == 'linux-x64' - #llvm needs libtinfo5, and it seems it's not by default in the system now run: | sudo apt-get update -y sudo apt-get install -y --allow-downgrades libstdc++6=8.4.0-1ubuntu1~18.04 sudo apt-get install --reinstall g++-8 - sudo apt-get install -y libncurses5 - name: Set up base deps on musl if: matrix.build == 'linux-musl-x64' run: | diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 60bc17f1b4f..65ef0043af1 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -12,9 +12,14 @@ env: jobs: lint: name: Code lint - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v3 + - name: Set up libstdc++ on Linux + run: | + sudo apt-get update -y + sudo apt-get install -y --allow-downgrades libstdc++6=8.4.0-1ubuntu1~18.04 + sudo apt-get install --reinstall g++-8 - name: Install Rust uses: dtolnay/rust-toolchain@stable with: