[WFX-334] Manually build cbindgen to get latest version.

BrowserWorks · Jun 23, 2022 · e0db25c · e0db25c
1 parent 22178a5
commit e0db25c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml
@@ -47,6 +47,7 @@ jobs:
       - name: 💿 Setup rust
         run: |
           rustup target add x86_64-pc-windows-msvc
+          cargo install cbindgen
 
       - name: ⏬ Setup win-cross
         run: |
@@ -105,6 +106,7 @@ jobs:
       - name: 💿 Build dependencies installation
         run: |
           rustup target add ${{ env.ARCH }}
+          cargo install cbindgen
           sudo apt install nasm yasm
           aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
@@ -162,6 +164,7 @@ jobs:
       - name: 💿 Build dependencies installation
         run: |
           rustup target add ${{ env.ARCH }}
+          cargo install cbindgen
           aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
@@ -225,6 +228,7 @@ jobs:
           aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
+          cargo install cbindgen
 
       - name: 🏗 Build
         run: |

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -48,6 +48,7 @@ jobs:
       - name: 💿 Setup rust
         run: |
           rustup target add x86_64-pc-windows-msvc
+          cargo install cbindgen
 
       - name: 💿 Setup jsign
         run: |
@@ -305,6 +306,7 @@ jobs:
           aria2c https://www.7-zip.org/a/7z2107-linux-x64.tar.xz
           tar xf 7z2107-linux-x64.tar.xz
           sudo mv 7zz /usr/local/bin/7z
+          cargo install cbindgen
 
       - name: 🏗 Build
         run: |

diff --git a/.mozconfig-x86_64-pc-windows-msvc b/.mozconfig-x86_64-pc-windows-msvc
@@ -4,7 +4,6 @@ export WINDOWSSDKDIR="${TOOLS}/win-sdk"
 EXTRA_PATH="${TOOLS}/clang/bin:${TOOLS}/visual-c/tools/msvc/14.31.31103/bin/hostx64/x64:"
 X=$(($(getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN)))
 
-export CBINDGEN="${TOOLS}/cbindgen/cbindgen"
 export CC="${TOOLS}/clang/bin/clang-cl"
 export CXX="${TOOLS}/clang/bin/clang-cl"
 export DIA_SDK_PATH="${TOOLS}/dia-sdk"

diff --git a/.mozconfig-x86_64-w64-mingw32 b/.mozconfig-x86_64-w64-mingw32
@@ -5,7 +5,6 @@ unset MAKECAB
 TOOLTOOL_DIR=$HOME/tooltool12
 
 AR="${TOOLTOOL_DIR}/clang/bin/llvm-ar"
-CBINDGEN="${TOOLTOOL_DIR}/cbindgen/cbindgen"
 CC="${TOOLTOOL_DIR}/clang/bin/x86_64-w64-mingw32-clang"
 CLANGPATH=$TOOLTOOL_DIR/clang
 BINDGEN_CFLAGS="-I$CLANGPATH/x86_64-w64-mingw32/include/c++/v1 -I$CLANGPATH/x86_64-w64-mingw32/include"