Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
MOZC_SHA: 78d14ff43eb3f0998c1a729951b5f6532fe6483a
MOZC_SHA: d9c3f195582de6b0baa07ecb81a04e8902acf9af

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download artifact
uses: actions/download-artifact@v5
uses: actions/download-artifact@v6
with:
pattern: artifact-${{ inputs.platform }}*
merge-multiple: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
DEBUG=1 python scripts/librime.py macos ${{ matrix.arch }}

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: artifact-librime-${{ matrix.arch }}
path: |
Expand All @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download artifact
uses: actions/download-artifact@v5
uses: actions/download-artifact@v6
with:
pattern: artifact-librime*
merge-multiple: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/harmony.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: python scripts/build.py harmony ${{ matrix.arch }}

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: artifact-harmony-${{ matrix.arch }}
path: |
Expand All @@ -68,7 +68,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download artifact
uses: actions/download-artifact@v5
uses: actions/download-artifact@v6
with:
pattern: artifact-harmony*
merge-multiple: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: python scripts/build.py ios ${{ matrix.platform }}

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: artifact-ios${{ matrix.postfix }}
path: |
Expand All @@ -79,7 +79,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download artifact
uses: actions/download-artifact@v5
uses: actions/download-artifact@v6
with:
pattern: artifact-ios*
merge-multiple: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
build:
runs-on: ubuntu-24.04
env:
EMSCRIPTEN_VERSION: '4.0.17'
EMSCRIPTEN_VERSION: '4.0.18'
steps:
- uses: actions/checkout@v5
with:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
python scripts/build.py js

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: artifact-js
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
run: python scripts/build.py macos ${{ matrix.arch }}

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: artifact-macos-${{ matrix.arch }}
path: |
Expand All @@ -80,7 +80,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download artifact
uses: actions/download-artifact@v5
uses: actions/download-artifact@v6
with:
pattern: artifact-macos*
merge-multiple: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: python scripts/build.py windows ${{ matrix.platform }}

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v5
with:
name: artifact-windows-${{ matrix.platform }}
path: |
Expand All @@ -61,7 +61,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download artifact
uses: actions/download-artifact@v5
uses: actions/download-artifact@v6
with:
pattern: artifact-windows*
merge-multiple: true
Expand Down
2 changes: 1 addition & 1 deletion libmozc
2 changes: 1 addition & 1 deletion libxkbcommon
Submodule libxkbcommon updated 144 files
2 changes: 1 addition & 1 deletion patches/glib.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build
index acaf44759..b91c8c3d0 100644
index 29b9ccb49..42e8aed47 100644
--- a/meson.build
+++ b/meson.build
@@ -2303,47 +2303,10 @@ endif
Expand Down
8 changes: 4 additions & 4 deletions patches/libxkbcommon.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
diff --git a/meson.build b/meson.build
index 9b642bf0..dec9a632 100644
index 150bbd5f..71149cc8 100644
--- a/meson.build
+++ b/meson.build
@@ -687,6 +687,7 @@ else
@@ -710,6 +710,7 @@ else
endif


+'''
# xkeyboard-config "verifier"
xkct_config = configuration_data()
xkct_config.set('MESON_BUILD_ROOT', meson.current_build_dir())
@@ -1150,6 +1151,7 @@ if get_option('enable-x11')
@@ -1220,6 +1221,7 @@ if get_option('enable-x11')
env: bench_env,
)
endif
+'''


# Documentation.
@@ -1277,6 +1279,6 @@ if meson.version().version_compare('>=0.62.0')
@@ -1347,6 +1349,6 @@ if meson.version().version_compare('>=0.62.0')
'variant': get_option('default-variant'),
}, section: 'Defaults')
summary({
Expand Down
2 changes: 1 addition & 1 deletion pcre2
Submodule pcre2 updated 425 files
1 change: 1 addition & 0 deletions scripts/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ def package(self):
ensure('rm', ['-rf', f'share/locale/{code}'])
else:
ensure('rm', ['-rf', 'share/locale'])
ensure('rm', ['-rf', 'share/doc', 'share/man'])
ensure(tar, ['cj',
'--sort=name', '--mtime=@0',
'--numeric-owner', '--owner=0', '--group=0', '--mode=go+u,go-w',
Expand Down