Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into UI
Browse files Browse the repository at this point in the history
  • Loading branch information
groverlynn committed Apr 28, 2024
2 parents c481e21 + 866eac5 commit 2b2ea77
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
17 changes: 17 additions & 0 deletions .github/workflows/release-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ on:
push:
tags:
- '*'
branches:
- master
workflow_dispatch:

jobs:
build:
runs-on: macos-14
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2b2ea77

Please sign in to comment.