Skip to content

Commit 2b2ea77

Browse files
committed
Merge remote-tracking branch 'upstream/master' into UI
2 parents c481e21 + 866eac5 commit 2b2ea77

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

.github/workflows/release-ci.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ on:
33
push:
44
tags:
55
- '*'
6+
branches:
7+
- master
8+
workflow_dispatch:
9+
610
jobs:
711
build:
812
runs-on: macos-14
@@ -30,12 +34,25 @@ jobs:
3034
echo 'changelog<<EOF' >> $GITHUB_OUTPUT
3135
./action-changelog.sh >> $GITHUB_OUTPUT
3236
echo 'EOF' >> $GITHUB_OUTPUT
37+
if: startsWith(github.ref, 'refs/tags/')
3338

3439
- name: Create release
40+
if: startsWith(github.ref, 'refs/tags/')
3541
uses: ncipollo/release-action@v1
3642
with:
3743
artifacts: "package/*.zip"
3844
body: |
3945
${{ steps.release_log.outputs.changelog }}
4046
draft: true
4147
token: ${{ secrets.GITHUB_TOKEN }}
48+
49+
- name: Create nightly release
50+
if: ${{ github.repository == 'rime/squirrel' && github.ref == 'refs/heads/master' }}
51+
uses: 'marvinpinto/action-automatic-releases@latest'
52+
with:
53+
repo_token: ${{ secrets.GITHUB_TOKEN }}
54+
automatic_release_tag: latest
55+
prerelease: true
56+
title: "Nightly build"
57+
files: |
58+
package/*.zip

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ librime: $(RIME_DEPS)
4444

4545
copy-rime-binaries:
4646
cp -L $(RIME_LIB_DIR)/$(RIME_LIBRARY_FILE_NAME) lib/
47-
cp -R $(RIME_LIB_DIR)/rime-plugins lib/
47+
cp -pR $(RIME_LIB_DIR)/rime-plugins lib/
4848
cp $(RIME_BIN_DIR)/rime_deployer bin/
4949
cp $(RIME_BIN_DIR)/rime_dict_manager bin/
5050
$(INSTALL_NAME_TOOL) $(INSTALL_NAME_TOOL_ARGS) bin/rime_deployer

0 commit comments

Comments
 (0)