From f3408d0389bfc196d4ed9db2878a6037e585d8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=B6=E7=88=B6=20=28taan=C2=B2=20fu=C2=B2=29?= Date: Thu, 19 Sep 2024 14:35:38 -0400 Subject: [PATCH 1/2] fix mac installer --- .ci/build_linux.sh | 2 +- .github/workflows/package.yml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.ci/build_linux.sh b/.ci/build_linux.sh index d119767..bcfa213 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 c817b29..2a3996b 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -18,7 +18,7 @@ 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} @@ -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" From a8018d1e03fa726c9aad1a92ede2fde25177c542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=B6=E7=88=B6=20=28taan=C2=B2=20fu=C2=B2=29?= Date: Thu, 19 Sep 2024 14:40:05 -0400 Subject: [PATCH 2/2] update2 --- .ci/build_linux.sh | 2 +- .github/workflows/package.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/build_linux.sh b/.ci/build_linux.sh index bcfa213..1a89458 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} -mv Squirrel*.Pkg build/mac/Squirrel.pkg +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 2a3996b..8c7ed46 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -24,7 +24,7 @@ jobs: # 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