Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build both x64 and Win32 WeaselServer and WeaselDeployer, install proper one by system version detection #1121

Merged
merged 14 commits into from
Mar 29, 2024
Merged

build both x64 and Win32 WeaselServer and WeaselDeployer, install proper one by system version detection #1121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6fb70a3
refactor: fixed DWORD ipc_id (combination of pid and order_id) instea…
fxliang Feb 27, 2024
bd0f69d
build: update build.bat, env templates, remove duplicate 'rime.lib' i…
fxliang Feb 27, 2024
8635369
build: fix ci `Copy librime built files cached`
fxliang Feb 27, 2024
684a4d4
build: update install.nsi: automatically Win32/x64 files(WeaselServer…
fxliang Feb 27, 2024
7695f19
build: PerMonitorHighDPIAware for WeaselDeployer WeaselServer WeaselT…
fxliang Mar 6, 2024
c014e23
chore on WeaselDeployer.exe:
fxliang Mar 8, 2024
ead40ca
build: version info not by rc but build.bat
fxliang Mar 9, 2024
a3dd190
build: large address aware for WeaselServer/WeaselDeployer 32 bit build
fxliang Mar 10, 2024
0b990d1
version info for WeaselTSF
fxliang Mar 16, 2024
d2bcfc5
update ci files: run on windows-2019 and build with vs2019 to avoid v…
fxliang Mar 26, 2024
592681b
chore: rename a local variable
lotem Mar 29, 2024
a0486ac
Update build.bat
fxliang Mar 29, 2024
60c4a96
chore: rename add_session
lotem Mar 29, 2024
9ae5bf0
rename to_session_id, get_session_status
lotem Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/commit-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
build:
runs-on: windows-2022
runs-on: windows-2019
env:
librime_build: 'submodule'
boost_version: 1.84.0
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Configure build environment
shell: bash
run: |
cp env.vs2022.bat env.bat
cp env.vs2019.bat env.bat
librime_id=$(git submodule foreach --quiet 'if [ $name == "librime" ]; then echo `git rev-parse HEAD`; fi')
echo "librime_id is $librime_id"
echo "librime_id=$librime_id" >> $GITHUB_ENV
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
with:
path: |
librime
key: ${{ runner.os }}-librime-${{ env.librime_id }}
key: ${{ runner.os }}-librime-${{ env.librime_id }}-dual

# build librime if not cached
- name: Build librime
Expand All @@ -89,9 +89,11 @@ jobs:
if: ${{ env.librime_build == 'submodule' && steps.cache-librime.outputs.cache-hit == 'true' }}
shell: bash
run: |
cp ./librime/dist/lib/rime* ./lib/
cp ./librime/dist/lib/rime.dll ./output/
cp ./librime/dist/include/*.h ./include/
cp ./librime/dist_x64/lib/rime* ./lib64/
cp ./librime/dist_x64/lib/rime.dll ./output/
cp ./librime/dist_x64/include/*.h ./include/
cp ./librime/dist_Win32/lib/rime* ./lib/
cp ./librime/dist_Win32/lib/rime.dll ./output/Win32/

- name: Build Weasel
id: build_weasel
Expand Down
28 changes: 21 additions & 7 deletions .github/workflows/release-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build-and-release:
permissions:
contents: write
runs-on: windows-2022
runs-on: windows-2019
env:
librime_build: submodule
boost_version: 1.84.0
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Configure build environment
shell: bash
run: |
cp env.vs2022.bat env.bat
cp env.vs2019.bat env.bat
librime_id=$(git submodule foreach --quiet 'if [ $name == "librime" ]; then echo `git rev-parse HEAD`; fi')
echo "librime_id is $librime_id"
echo "librime_id=$librime_id" >> $GITHUB_ENV
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
with:
path: |
librime
key: ${{ runner.os }}-librime-${{ env.librime_id }}
key: ${{ runner.os }}-librime-${{ env.librime_id }}-dual

# build librime if not cached for nightly build and not stable release
- name: Build librime
Expand All @@ -86,12 +86,26 @@ jobs:
if: ${{ github.ref == 'refs/heads/master' && env.librime_build == 'submodule' && steps.cache-librime.outputs.cache-hit == 'true' }}
shell: bash
run: |
cp ./librime/dist/lib/rime* ./lib/
cp ./librime/dist/lib/rime.dll ./output/
cp ./librime/dist/include/*.h ./include/
cp ./librime/dist_x64/lib/rime* ./lib64/
cp ./librime/dist_x64/lib/rime.dll ./output/
cp ./librime/dist_x64/include/*.h ./include/
cp ./librime/dist_Win32/lib/rime* ./lib/
cp ./librime/dist_Win32/lib/rime.dll ./output/Win32/

- name: Build Weasel
- name: Build Weasel Release
id: build_weasel
if: startsWith(github.ref, 'refs/tags/')
shell: bash
env:
RELEASE_BUILD: 1
run: |
./build.bat data
./build.bat hant arm64
./build.bat installer

- name: Build Weasel Nightly
id: build_weasel_nightly
if: github.ref == 'refs/heads/master'
shell: bash
run: |
./build.bat data
Expand Down
Loading