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

rime · Apr 26, 2024 · cd108e7 · cd108e7
2 parents f61147c + 866eac5
commit cd108e7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 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/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj
@@ -87,9 +87,9 @@
 		F49829A62B9C8A880093E3A9 /* InputMethodKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC612B9C799400059E3A /* InputMethodKit.framework */; };
 		F49829A72B9C8A8F0093E3A9 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC632B9C799400059E3A /* QuartzCore.framework */; };
 		F49829A82B9C8A920093E3A9 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC642B9C799400059E3A /* UserNotifications.framework */; };
-		F4DCD9EB2BDBE4FB00CEFEBB /* librime-lua.dylib in Copy Plugins */ = {isa = PBXBuildFile; fileRef = F4DCD9E92BDBE49400CEFEBB /* librime-lua.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
-		F4DCD9EC2BDBE4FB00CEFEBB /* librime-octagram.dylib in Copy Plugins */ = {isa = PBXBuildFile; fileRef = F4DCD9E72BDBE48E00CEFEBB /* librime-octagram.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
-		F4DCD9ED2BDBE4FB00CEFEBB /* librime-predict.dylib in Copy Plugins */ = {isa = PBXBuildFile; fileRef = F4DCD9E82BDBE49200CEFEBB /* librime-predict.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		F4DCD9EB2BDBE4FB00CEFEBB /* librime-lua.dylib in Copy Rime plugins */ = {isa = PBXBuildFile; fileRef = F4DCD9E92BDBE49400CEFEBB /* librime-lua.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		F4DCD9EC2BDBE4FB00CEFEBB /* librime-octagram.dylib in Copy Rime plugins */ = {isa = PBXBuildFile; fileRef = F4DCD9E72BDBE48E00CEFEBB /* librime-octagram.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		F4DCD9ED2BDBE4FB00CEFEBB /* librime-predict.dylib in Copy Rime plugins */ = {isa = PBXBuildFile; fileRef = F4DCD9E82BDBE49200CEFEBB /* librime-predict.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -189,17 +189,17 @@
 			name = "Copy 3rd-party Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F4DCD9EA2BDBE4D000CEFEBB /* Copy Plugins */ = {
+		F4DCD9EA2BDBE4D000CEFEBB /* Copy Rime plugins */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "rime-plugins";
 			dstSubfolderSpec = 10;
 			files = (
-				F4DCD9EB2BDBE4FB00CEFEBB /* librime-lua.dylib in Copy Plugins */,
-				F4DCD9EC2BDBE4FB00CEFEBB /* librime-octagram.dylib in Copy Plugins */,
-				F4DCD9ED2BDBE4FB00CEFEBB /* librime-predict.dylib in Copy Plugins */,
+				F4DCD9EB2BDBE4FB00CEFEBB /* librime-lua.dylib in Copy Rime plugins */,
+				F4DCD9EC2BDBE4FB00CEFEBB /* librime-octagram.dylib in Copy Rime plugins */,
+				F4DCD9ED2BDBE4FB00CEFEBB /* librime-predict.dylib in Copy Rime plugins */,
 			);
-			name = "Copy Plugins";
+			name = "Copy Rime plugins";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -531,7 +531,7 @@
 				8D11072C0486CEB800E47090 /* Sources */,
 				8D11072E0486CEB800E47090 /* Frameworks */,
 				A464E3780F65263000148227 /* Copy 3rd-party Frameworks */,
-				F4DCD9EA2BDBE4D000CEFEBB /* Copy Plugins */,
+				F4DCD9EA2BDBE4D000CEFEBB /* Copy Rime plugins */,
 				44DA7A1614DD581B00C1ED3B /* Copy Shared Support Files */,
 				4407F3CA14EC079A001329FE /* Copy opencc Files */,
 				44E21A8D16A653AC00C2B08F /* CopyFiles */,