update packages & configs

rime · Feb 10, 2024 · 78f1408 · 78f1408
1 parent c752bb6
commit 78f1408
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 29 deletions.
diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml
@@ -5,7 +5,7 @@ on:
       - '*'
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout last commit
         uses: actions/checkout@v3

diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml
@@ -2,7 +2,7 @@ name: pull request ci
 on: [pull_request]
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
       - name: Checkout last commit
         uses: actions/checkout@v3

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -5,7 +5,7 @@ on:
       - '*'
 jobs:
   build:
-    runs-on: macos-latest
+    runs-on: macos-14
     env:
       SQUIRREL_BUNDLED_RECIPES: 'lotem/rime-octagram-data lotem/rime-octagram-data@hant'
     steps:

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "librime"]
 	path = librime
-	url = https://github.com/rime/librime.git
+	url = url = https://github.com/rime/librime.git
 	ignore = dirty
 [submodule "plum"]
 	path = plum

diff --git a/INSTALL.md b/INSTALL.md
@@ -96,8 +96,14 @@ port install boost -no_static
 
 * Make sure you have updated all the dependencies. If you cloned squirrel with the command in this guide, you've already done it. But if not, this command will update submodules.
 
-```
+``` sh
 git submodule update --init --recursive
+
+export BUILD_UNIVERSAL=1
+export CMAKE_GENERATOR=Ninja
+
+make -C librime
+make deps
 ```
 
 * With all dependencies ready, build `Squirrel.app`:
@@ -122,7 +128,7 @@ make ARCHS='arm64'
 
 Just add `package` after `make`
 
-```
+``` sh
 make package ARCHS='arm64'
 ```
 

diff --git a/Makefile b/Makefile
@@ -85,9 +85,9 @@ _=$() $()
 export CMAKE_OSX_ARCHITECTURES = $(subst $(_),;,$(ARCHS))
 endif
 
-ifdef MACOSX_DEPLOYMENT_TARGET
+# https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html
+MACOSX_DEPLOYMENT_TARGET ?= 10.15
 BUILD_SETTINGS += MACOSX_DEPLOYMENT_TARGET="$(MACOSX_DEPLOYMENT_TARGET)"
-endif
 
 release: $(DEPS_CHECK)
 	bash package/add_data_files

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@
 安裝輸入法
 ---
 
-本品適用於 macOS 12.0+
+本品適用於 macOS 10.15+
 
 初次安裝，如果在部份應用程序中打不出字，請註銷並重新登錄。
 

diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj
diff --git a/action-install.sh b/action-install.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-rime_version=1.9.0-m
-rime_git_hash=8779bc8
+rime_version=latest
+rime_git_hash=04c4127
 
 rime_archive="rime-${rime_git_hash}-macOS.tar.bz2"
 rime_download_url="https://github.com/groverlynn/librime/releases/download/${rime_version}/${rime_archive}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ on: @@
           - '*'
     jobs:
       build:
-        runs-on: macos-latest
+        runs-on: macos-14
         env:
           SQUIRREL_BUNDLED_RECIPES: 'lotem/rime-octagram-data lotem/rime-octagram-data@hant'
         steps:
@@ Expand Down @@