Skip to content

Commit

Permalink
Fix typo & Do not upload artifacts in pull requests
Browse files Browse the repository at this point in the history
  • Loading branch information
yjf2002ghty committed Dec 5, 2024
1 parent 3cb5547 commit cb41ef8
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 8 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,48 +15,55 @@ jobs:
- run: ./release_make/CI.sh

- uses: actions/upload-artifact@v4
if: github.event_name != 'pull_request'
with:
name: Fairyground-Windows-x86_64
path: ./release_make/release-builds/win/x64/fairyground.7z
compression-level: 0
if-no-files-found: error

- uses: actions/upload-artifact@v4
if: github.event_name != 'pull_request'
with:
name: Fairyground-Windows-ARM64
path: ./release_make/release-builds/win/arm64/fairyground.7z
compression-level: 0
if-no-files-found: error

- uses: actions/upload-artifact@v4
if: github.event_name != 'pull_request'
with:
name: Fairyground-Linux-x86_64
path: ./release_make/release-builds/linux/x64/fairyground.7z
compression-level: 0
if-no-files-found: error

- uses: actions/upload-artifact@v4
if: github.event_name != 'pull_request'
with:
name: Fairyground-Linux-ARM64
path: ./release_make/release-builds/linux/arm64/fairyground.7z
compression-level: 0
if-no-files-found: error

- uses: actions/upload-artifact@v4
if: github.event_name != 'pull_request'
with:
name: Fairyground-Script-AllPlatform
path: ./release_make/release-builds/script/any/fairyground.7z
compression-level: 0
if-no-files-found: error

- uses: actions/upload-artifact@v4
if: github.event_name != 'pull_request'
with:
name: Source_Code
path: ./source.7z
compression-level: 0
if-no-files-found: error

- uses: mholetzko/[email protected]
if: github.event_name != 'pull_request'
with:
title: "Fairyground Download Notice"
info: "Choose the version that matches your platform (i.e. CPU architecture and operating system).\n\"Fairyground-Script-AllPlatform\" is a script version that theorically supports all platforms but you need to install node.js before running it (See HOW_TO_USE.txt in the archive).\nOther versions are provided with a binary executable and are portable.\n ❗ If you don't know which version to download or no version suits your platform (e.g. macOS), select \"Fairyground-Script-AllPlatform\" and then follow HOW_TO_USE.txt in the archive."
Expand Down
21 changes: 14 additions & 7 deletions release_make/CI.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ echo "[Info] Continuous integration starts."

sudo apt -y install p7zip-full || Error

7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count -xr!release_make -xr!.git ./source.7z ./* || Error
if [ "$GITHUB_EVENT_NAME" != "pull_request" ]; then
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count -xr!release_make -xr!.git ./source.7z ./* || Error
fi

cd ./release_make

Expand Down Expand Up @@ -146,11 +148,16 @@ echo "If it does not work, please check your node.js installation and make sure

echo "[Info] CI build test OK."

7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/win/x64/fairyground.7z ./release_make/release-builds/win/x64/* || Error
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/linux/x64/fairyground.7z ./release_make/release-builds/linux/x64/* || Error
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/win/arm64/fairyground.7z ./release_make/release-builds/win/arm64/* || Error
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/linux/arm64/fairyground.7z ./release_make/release-builds/linux/arm64/* || Error
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/script/any/fairyground.7z ./release_make/release-builds/script/any/* || Error
if [ "$GITHUB_EVENT_NAME" != "pull_request" ]; then
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/win/x64/fairyground.7z ./release_make/release-builds/win/x64/* || Error
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/linux/x64/fairyground.7z ./release_make/release-builds/linux/x64/* || Error
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/win/arm64/fairyground.7z ./release_make/release-builds/win/arm64/* || Error
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/linux/arm64/fairyground.7z ./release_make/release-builds/linux/arm64/* || Error
7za a -y -t7z -m0=lzma2 -mx=9 -mfb=256 -md=256m -ms=on -mmt=$thread_count ./release_make/release-builds/script/any/fairyground.7z ./release_make/release-builds/script/any/* || Error

echo "[Info] Artifacts are ready. Pending upload..."
else
echo "[Notice] Artifacts are not uploaded in pull requests."
fi

echo "[Info] Artifacts are ready. Pending upload..."
exit 0
2 changes: 1 addition & 1 deletion src/html/advanced.html
Original file line number Diff line number Diff line change
Expand Up @@ -8469,7 +8469,7 @@
title:
"Thai letters on bottom, Thai numbers on side.",
},
"Mukruk Thai Letter-Thai Algebraic (THAI_ALGEBRAIC)",
"Makruk Thai Letter-Thai Algebraic (THAI_ALGEBRAIC)",
),
],
),
Expand Down

0 comments on commit cb41ef8

Please sign in to comment.