Merge remote-tracking branch 'upstream/master' into extension

groverlynn · Apr 28, 2024 · 5975255 · 5975255
2 parents dfa79d1 + 866eac5
commit 5975255
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -3,6 +3,10 @@ on:
   push:
     tags:
       - '*'
+    branches:
+      - master
+  workflow_dispatch:
+
 jobs:
   build:
     runs-on: macos-14
@@ -30,12 +34,25 @@ jobs:
           echo 'changelog<<EOF' >> $GITHUB_OUTPUT
           ./action-changelog.sh >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
+        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Create release
+        if: startsWith(github.ref, 'refs/tags/')
         uses: ncipollo/release-action@v1
         with:
           artifacts: "package/*.zip"
           body: |
             ${{ steps.release_log.outputs.changelog }}
           draft: true
           token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create nightly release
+        if: ${{ github.repository == 'rime/squirrel' && github.ref == 'refs/heads/master' }}
+        uses: 'marvinpinto/action-automatic-releases@latest'
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          automatic_release_tag: latest
+          prerelease: true
+          title: "Nightly build"
+          files: |
+            package/*.zip
diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ librime: $(RIME_DEPS)
 
 copy-rime-binaries:
 	cp -L $(RIME_LIB_DIR)/$(RIME_LIBRARY_FILE_NAME) lib/
-	cp -R $(RIME_LIB_DIR)/rime-plugins lib/
+	cp -pR $(RIME_LIB_DIR)/rime-plugins lib/
 	cp $(RIME_BIN_DIR)/rime_deployer bin/
 	cp $(RIME_BIN_DIR)/rime_dict_manager bin/
 	$(INSTALL_NAME_TOOL) $(INSTALL_NAME_TOOL_ARGS) bin/rime_deployer

diff --git a/action-install.sh b/action-install.sh
@@ -2,14 +2,14 @@
 
 set -e
 
-rime_version=1.11.0-e
-rime_git_hash=b7c5e1b
+rime_version=1.11.0
+rime_git_hash=76a0a16
 
 rime_archive="rime-${rime_git_hash}-macOS-universal.tar.bz2"
-rime_download_url="https://github.com/groverlynn/librime/releases/download/${rime_version}/${rime_archive}"
+rime_download_url="https://github.com/rime/librime/releases/download/${rime_version}/${rime_archive}"
 
 rime_deps_archive="rime-deps-${rime_git_hash}-macOS-universal.tar.bz2"
-rime_deps_download_url="https://github.com/groverlynn/librime/releases/download/${rime_version}/${rime_deps_archive}"
+rime_deps_download_url="https://github.com/rime/librime/releases/download/${rime_version}/${rime_deps_archive}"
 
 mkdir -p download && (
     cd download

diff --git a/librime b/librime
+2 −0		.gitignore
+11 −0		CHANGELOG.md
+1 −1		CMakeLists.txt
+1 −0		README.md
+1 −1		cmake/FindYamlCpp.cmake
+1 −1		package.json
+64 −7		src/rime/algo/encoder.cc
+5 −0		src/rime/algo/encoder.h
+1 −1		src/rime/algo/syllabifier.h
+2 −2		src/rime/engine.cc
+20 −5		src/rime/gear/ascii_composer.cc
+1 −0		src/rime/gear/ascii_composer.h
+12 −10		src/rime/gear/editor.cc
+1 −1		src/rime/gear/key_binder.cc
+4 −3		src/rime/gear/key_binding_processor.h
+9 −2		src/rime/gear/key_binding_processor_impl.h
+8 −5		src/rime/gear/punctuator.cc
+1 −1		src/rime/gear/recognizer.cc
+11 −5		src/rime/gear/script_translator.cc
+20 −2		src/rime/gear/selector.cc
+1 −0		src/rime/gear/selector.h
+2 −2		src/rime/gear/shape.cc
+6 −2		src/rime/gear/simplifier.cc
+1 −1		src/rime/gear/speller.cc
+19 −14		src/rime/gear/switch_translator.cc
+6 −3		src/rime/key_event.h
+1 −1		src/rime/schema.cc
+1 −1		src/rime/switcher.cc
+28 −0		src/rime_api.cc
+2 −0		src/rime_api.h