From b0d8cf55d08662c81874e0978745edec9d0540d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=B6=E7=88=B6?= Date: Thu, 19 Sep 2024 14:43:22 -0400 Subject: [PATCH] Update(CI): Mac installer script (#194) Fixes Mac package tool errors. --- .ci/build_linux.sh | 2 +- .github/workflows/package.yml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.ci/build_linux.sh b/.ci/build_linux.sh index d1197678..1a894588 100644 --- a/.ci/build_linux.sh +++ b/.ci/build_linux.sh @@ -9,7 +9,7 @@ mkdir -p build/mac # Download Mac installation script, Mac package and unzip wget ${SQUIRREL_LINK} -7z e Squirrel*.zip -obuild/mac/ +mv Squirrel*.Pkg ./build/mac/Squirrel.pkg cat .ci/mac-install-template.sh | envsubst '${SQUIRREL_PACKAGES}' > ./build/mac/mac-install.sh # Build archives diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index c817b29d..8c7ed469 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -18,13 +18,13 @@ jobs: - name: build run: | export SQUIRREL_VERSION=$( git ls-remote --tags --refs --sort="v:refname" https://github.com/rime/squirrel.git | grep -v '/latest$' | tail -n1 | sed 's/.*\///' ) - export SQUIRREL_LINK=https://github.com/rime/squirrel/releases/download/${SQUIRREL_VERSION}/Squirrel-${SQUIRREL_VERSION}.zip + export SQUIRREL_LINK=https://github.com/rime/squirrel/releases/download/${SQUIRREL_VERSION}/Squirrel-${SQUIRREL_VERSION}.Pkg export SQUIRREL_PACKAGES="cantonese emoji CanCLID/rime-loengfan custom:set:config=default,key=installed_from,value=rime-cantonese custom:clear_schema_list custom:add:schema=jyut6ping3 custom:add:schema=cangjie5 custom:add:schema=stroke custom:add:schema=luna_pinyin lotem/rime-octagram-data lotem/rime-octagram-data@hant lotem/rime-octagram-data:customize:schema=jyut6ping3,model=hant" export IBUS_PACKAGES=${SQUIRREL_PACKAGES} # Download Mac installation script, Mac package and unzip wget ${SQUIRREL_LINK} - 7z e Squirrel*.zip -obuild/mac/ + mv Squirrel*.Pkg ./build/mac/Squirrel.pkg cat .ci/mac-install-template.sh | envsubst '${SQUIRREL_PACKAGES}' > ./build/mac/mac-install.sh # Build archives @@ -49,7 +49,8 @@ jobs: - run: mkdir output - run: chmod u+x .ci/* - run: mkdir -p build/windows/data - - run: | + - name: build + run: | export WEASEL_VERSION=$( git ls-remote --tags --refs --sort="v:refname" https://github.com/rime/weasel.git | grep -v '/latest$' | tail -n1 | sed 's/.*\///' ) export WEASEL_LINK=https://github.com/rime/weasel/releases/download/${WEASEL_VERSION}/weasel-${WEASEL_VERSION}.0-installer.exe export WEASEL_PACKAGES="cantonese emoji CanCLID/rime-loengfan custom:set:config=default,key=installed_from,value=rime-cantonese custom:clear_schema_list custom:add:schema=jyut6ping3 custom:add:schema=cangjie5 custom:add:schema=stroke custom:add:schema=luna_pinyin lotem/rime-octagram-data lotem/rime-octagram-data@hant lotem/rime-octagram-data:customize:schema=jyut6ping3,model=hant"