fix ci

fxliang · Feb 18, 2024 · 77b6af2 · 77b6af2
1 parent 853914c
commit 77b6af2
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 7 deletions.
diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml
@@ -51,16 +51,47 @@ jobs:
         if: env.librime_build == 'stable'
         run: .\github.install.bat
 
-      - name: Build librime
+      - name: Build librime 64 bit
         if: env.librime_build == 'submodule'
         env:
+          ARCH: x64
           RIME_PLUGINS: hchunhui/librime-lua lotem/librime-octagram rime/librime-predict
         shell: bash
         run: |
           # load plugins
           pushd librime
           ./action-install-plugins-windows.bat
           popd
+          # build librime
+          ./build.bat librime
+          # copy x64 files to weasel and rename
+          echo " ./lib/rimex64.dll"
+          cp ./librime/dist/lib/rime.dll ./lib/rimex64.dll
+          echo " ./lib/rimex64.lib"
+          cp ./librime/dist/lib/rime.lib ./lib/rimex64.lib
+          echo " ./output/x64/rime.dll"
+          cp ./librime/dist/lib/rime.dll ./output/x64/rime.dll
+
+      - name: Build librime
+        if: env.librime_build == 'submodule'
+        env:
+          ARCH: Win32
+          RIME_PLUGINS: hchunhui/librime-lua lotem/librime-octagram rime/librime-predict
+        shell: bash
+        run: |
+          # clean x64
+          rm -rf ./librime/deps/opencc/build/
+          rm -rf ./librime/deps/glog/build/
+          rm -rf ./librime/deps/googletest/build/
+          rm -rf ./librime/deps/leveldb/build/
+          rm -rf ./librime/deps/marisa-trie/build/
+          rm -rf ./librime/deps/yaml-cpp/build/
+          rm -rf ./librime/build/
+          rm -rf ./librime/lib/*.lib
+          rm -rf ./librime/lib/cmake
+          rm -rf ./librime/lib/pkgconfig
+          rm -rf ./librime/dist
+          # build librime
           ./build.bat librime
 
       - name: Build Weasel

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -49,16 +49,47 @@ jobs:
         run: |
           .\github.install.bat
 
-      - name: Build librime
+      - name: Build librime 64 bit
         if: env.librime_build == 'submodule'
         env:
+          ARCH: x64
           RIME_PLUGINS: hchunhui/librime-lua lotem/librime-octagram rime/librime-predict
         shell: bash
         run: |
           # load plugins
           pushd librime
           ./action-install-plugins-windows.bat
           popd
+          # build librime
+          ./build.bat librime
+          # copy x64 files to weasel and rename
+          echo " ./lib/rimex64.dll"
+          cp ./librime/dist/lib/rime.dll ./lib/rimex64.dll
+          echo " ./lib/rimex64.lib"
+          cp ./librime/dist/lib/rime.lib ./lib/rimex64.lib
+          echo " ./output/x64/rime.dll"
+          cp ./librime/dist/lib/rime.dll ./output/x64/rime.dll
+
+      - name: Build librime
+        if: env.librime_build == 'submodule'
+        env:
+          ARCH: Win32
+          RIME_PLUGINS: hchunhui/librime-lua lotem/librime-octagram rime/librime-predict
+        shell: bash
+        run: |
+          # clean x64
+          rm -rf ./librime/deps/opencc/build/
+          rm -rf ./librime/deps/glog/build/
+          rm -rf ./librime/deps/googletest/build/
+          rm -rf ./librime/deps/leveldb/build/
+          rm -rf ./librime/deps/marisa-trie/build/
+          rm -rf ./librime/deps/yaml-cpp/build/
+          rm -rf ./librime/build/
+          rm -rf ./librime/lib/*.lib
+          rm -rf ./librime/lib/cmake
+          rm -rf ./librime/lib/pkgconfig
+          rm -rf ./librime/dist
+          # build librime
           ./build.bat librime
 
       - name: Build Weasel

diff --git a/env.bat.template b/env.bat.template
@@ -1,9 +1,10 @@
 rem Customize your build environment and save the modified copy to env.bat
 
 rem REQUIRED: path to Boost source directory
-set BOOST_ROOT=C:\Libraries\boost_1_78_0
+set BOOST_ROOT=C:\Libraries\boost_1_83_0
 
 rem OPTIONAL: Visual Studio version and platform toolset
+if not defined ARCH set ARCH=Win32
 rem set BJAM_TOOLSET=msvc-14.2
 rem set PLATFORM_TOOLSET=v142
 

diff --git a/env.vs2019.bat b/env.vs2019.bat
@@ -3,10 +3,10 @@ rem Customize your build environment and save the modified copy to env.bat
 set WEASEL_ROOT=%CD%
 
 rem REQUIRED: path to Boost source directory
-if not defined BOOST_ROOT set BOOST_ROOT=%WEASEL_ROOT%\deps\boost_1_78_0
+if not defined BOOST_ROOT set BOOST_ROOT=%WEASEL_ROOT%\deps\boost_1_83_0
 
 rem OPTIONAL: architecture, Visual Studio version and platform toolset
-set ARCH=Win32
+if not defined ARCH set ARCH=Win32
 set BJAM_TOOLSET=msvc-14.2
 set CMAKE_GENERATOR="Visual Studio 16 2019"
 set PLATFORM_TOOLSET=v142

diff --git a/env.vs2022.bat b/env.vs2022.bat
@@ -3,10 +3,10 @@ rem Customize your build environment and save the modified copy to env.bat
 set WEASEL_ROOT=%CD%
 
 rem REQUIRED: path to Boost source directory
-if not defined BOOST_ROOT set BOOST_ROOT=%WEASEL_ROOT%\deps\boost_1_78_0
+if not defined BOOST_ROOT set BOOST_ROOT=%WEASEL_ROOT%\deps\boost_1_83_0
 
 rem OPTIONAL: architecture, Visual Studio version and platform toolset
-set ARCH=Win32
+if not defined ARCH set ARCH=Win32
 set BJAM_TOOLSET=msvc-14.3
 set CMAKE_GENERATOR="Visual Studio 17 2022"
 set PLATFORM_TOOLSET=v143