1.17rc1 (#748)
* human-like model * kivy 2 * uv * window location fix * macosx package no thanks to jules who is a derp, but cloud is hapl and fix. * settings gui a bit clearer * better ci i hope --------- Co-authored-by: TuNanTang <tunantang@aliyun.com> Co-authored-by: jtkelm2 <feryllcuber@gmail.com>
This commit is contained in:
44 files changed
+2992
-1698
No files matched your search
@@ -1,82 +0,0 @@
|
||||
name: build_osx
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ master ]
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
osx_app:
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: 3.9
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
brew update
|
||||
brew install libzip
|
||||
|
||||
- name: Build KataGo
|
||||
run: |
|
||||
rm katrain/KataGo/katago
|
||||
rm katrain/KataGo/*.dll
|
||||
rm katrain/KataGo/katago.exe
|
||||
cd ..
|
||||
git clone --branch stable https://github.com/lightvector/KataGo.git
|
||||
pushd KataGo/cpp
|
||||
cmake . -DUSE_BACKEND=OPENCL -DBUILD_DISTRIBUTED=1
|
||||
make
|
||||
cp katago ../../katrain/katrain/KataGo/katago-osx
|
||||
- name: Install platypus
|
||||
run: |
|
||||
curl -L --output "platypus.zip" https://github.com/sveinbjornt/Platypus/releases/download/5.3/platypus5.3.zip
|
||||
unzip "platypus.zip"
|
||||
gunzip Platypus.app/Contents/Resources/platypus_clt.gz
|
||||
gunzip Platypus.app/Contents/Resources/ScriptExec.gz
|
||||
sudo mkdir -p /usr/local/bin
|
||||
sudo mkdir -p /usr/local/share/platypus
|
||||
sudo cp Platypus.app/Contents/Resources/platypus_clt /usr/local/bin/platypus
|
||||
sudo cp Platypus.app/Contents/Resources/ScriptExec /usr/local/share/platypus/ScriptExec
|
||||
sudo cp -a Platypus.app/Contents/Resources/MainMenu.nib /usr/local/share/platypus/MainMenu.nib
|
||||
sudo chmod -R 755 /usr/local/share/platypus
|
||||
- name: Get Kivy dependencies
|
||||
run: |
|
||||
brew install ninja
|
||||
cd ..
|
||||
git clone https://github.com/kivy/kivy-sdk-packager.git
|
||||
cd kivy-sdk-packager/osx
|
||||
./create-osx-bundle.sh -n "KaTrain" -a "Sander Land" -o "org.katrain.KaTrain" -i "../../katrain/katrain/img/icon.ico"
|
||||
- name: Install KaTrain pip dependencies
|
||||
run: |
|
||||
pushd ../kivy-sdk-packager/osx/build/KaTrain.app/Contents/Resources/venv/bin
|
||||
source activate
|
||||
popd
|
||||
python -m pip install poetry
|
||||
poetry install
|
||||
- name: Finalize KaTrain bundle
|
||||
run: |
|
||||
export KATRAIN_VERSION=`python -c 'from katrain.core.constants import VERSION;print(VERSION)' `
|
||||
echo "Setting version to ${KATRAIN_VERSION}"
|
||||
cd ../kivy-sdk-packager/osx/build
|
||||
pushd KaTrain.app/Contents/Resources/
|
||||
ln -s ./venv/bin/KaTrain yourapp
|
||||
popd
|
||||
../fix-bundle-metadata.sh KaTrain.app -n KaTrain -v "${KATRAIN_VERSION}" -a "Sander Land" -o "org.katrain.KaTrain" -i "../../katrain/katrain/img/icon.ico"
|
||||
../cleanup-app.sh KaTrain.app
|
||||
../relocate.sh KaTrain.app
|
||||
- name: Create dmg
|
||||
run: |
|
||||
pushd ../kivy-sdk-packager/osx
|
||||
./create-osx-dmg.sh build/KaTrain.app KaTrain
|
||||
popd
|
||||
mkdir osx_app
|
||||
cp ../kivy-sdk-packager/osx/KaTrain.dmg osx_app/
|
||||
- name: Upload app as artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: KaTrainOSX
|
||||
path: osx_app
|
||||
@@ -1,38 +0,0 @@
|
||||
name: release
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ master ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: 3.12
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
pip3 install poetry
|
||||
poetry self add "poetry-dynamic-versioning[plugin]"
|
||||
poetry install --with dev,test
|
||||
|
||||
- name: Run tests
|
||||
run: poetry run pytest -v -s tests
|
||||
|
||||
- name: Run I18N conversion
|
||||
run: poetry run python i18n.py
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
poetry build
|
||||
|
||||
- name: Release to PyPI
|
||||
env:
|
||||
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
|
||||
run: poetry publish --verbose
|
||||
@@ -1,38 +0,0 @@
|
||||
name: test
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ master ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: ['3.9', '3.12'] # '3.11',
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Python ${{ matrix.python-version }}
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
pip3 install poetry
|
||||
poetry self add "poetry-dynamic-versioning[plugin]"
|
||||
poetry install --with dev,test
|
||||
|
||||
- name: Run tests
|
||||
run: poetry run pytest tests
|
||||
|
||||
- name: Run I18N conversion
|
||||
run: poetry run python i18n.py -todo
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
poetry build
|
||||
@@ -0,0 +1,218 @@
|
||||
# .github/workflows/test_and_build.yml
|
||||
|
||||
name: Test, Build, and Release
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
create_release:
|
||||
description: 'Create draft release'
|
||||
required: true
|
||||
default: false
|
||||
type: boolean
|
||||
publish_pypi:
|
||||
description: 'Publish to PyPI'
|
||||
required: true
|
||||
default: false
|
||||
type: boolean
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
|
||||
|
||||
jobs:
|
||||
# This job runs first to prepare shared information for other jobs.
|
||||
prepare:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.version }}
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Get project version
|
||||
id: version
|
||||
uses: ./.github/actions/get-version
|
||||
|
||||
test:
|
||||
needs: prepare
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: ['3.9', '3.12']
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Python and uv
|
||||
uses: ./.github/actions/setup-python-uv
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
sync-groups: test
|
||||
|
||||
- name: Run tests
|
||||
run: uv run pytest tests
|
||||
|
||||
- name: Check I18N conversion
|
||||
run: uv run python i18n.py -todo
|
||||
|
||||
- name: Check package can be built
|
||||
run: uv build
|
||||
|
||||
build-windows:
|
||||
needs: [prepare, test]
|
||||
runs-on: windows-latest
|
||||
env:
|
||||
KATRAIN_VERSION: ${{ needs.prepare.outputs.version }}
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Python, uv, and PyInstaller
|
||||
uses: ./.github/actions/setup-python-uv
|
||||
with:
|
||||
install-pyinstaller: 'true'
|
||||
|
||||
- name: Build executables with PyInstaller
|
||||
run: uv run pyinstaller spec/katrain.spec --clean --noconfirm
|
||||
shell: powershell
|
||||
|
||||
- name: Create archives
|
||||
run: |
|
||||
New-Item -ItemType Directory -Path "windows_exe" -Force
|
||||
if (Test-Path "dist/KaTrain") {
|
||||
Compress-Archive -Path "dist/KaTrain" -DestinationPath "windows_exe/KaTrain-${{ env.KATRAIN_VERSION }}-folder.zip"
|
||||
}
|
||||
if (Test-Path "dist/DebugKaTrain") {
|
||||
Compress-Archive -Path "dist/DebugKaTrain" -DestinationPath "windows_exe/DebugKaTrain-${{ env.KATRAIN_VERSION }}-folder.zip"
|
||||
}
|
||||
if (Test-Path "dist/KaTrain.exe") {
|
||||
Copy-Item "dist/KaTrain.exe" "windows_exe/KaTrain-${{ env.KATRAIN_VERSION }}.exe"
|
||||
}
|
||||
if (Test-Path "dist/DebugKaTrain.exe") {
|
||||
Copy-Item "dist/DebugKaTrain.exe" "windows_exe/DebugKaTrain-${{ env.KATRAIN_VERSION }}.exe"
|
||||
}
|
||||
shell: powershell
|
||||
|
||||
- name: Upload Windows artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: KaTrainWindows-${{ env.KATRAIN_VERSION }}
|
||||
path: windows_exe
|
||||
|
||||
build-macos:
|
||||
needs: [prepare, test]
|
||||
runs-on: macos-latest
|
||||
env:
|
||||
KATRAIN_VERSION: ${{ needs.prepare.outputs.version }}
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Python, uv, and PyInstaller
|
||||
uses: ./.github/actions/setup-python-uv
|
||||
with:
|
||||
install-pyinstaller: 'true'
|
||||
|
||||
- name: Install macOS dependencies
|
||||
run: |
|
||||
brew update
|
||||
brew install libzip
|
||||
brew install --build-from-source sdl2 sdl2_image sdl2_ttf sdl2_mixer
|
||||
|
||||
- name: Build KataGo
|
||||
run: |
|
||||
rm -f katrain/KataGo/katago katrain/KataGo/*.dll katrain/KataGo/katago.exe
|
||||
git clone --depth 1 --branch stable https://github.com/lightvector/KataGo.git ../KataGo
|
||||
pushd ../KataGo/cpp
|
||||
cmake . -DUSE_BACKEND=OPENCL -DBUILD_DISTRIBUTED=1
|
||||
make -j$(sysctl -n hw.ncpu)
|
||||
cp katago ../../katrain/katrain/KataGo/katago-osx
|
||||
popd
|
||||
|
||||
- name: Build app with PyInstaller
|
||||
env:
|
||||
KIVY_HEADLESS: 1
|
||||
KIVY_NO_WINDOW: 1
|
||||
KIVY_GL_BACKEND: mock
|
||||
run: uv run pyinstaller spec/katrain.spec --clean --noconfirm
|
||||
|
||||
- name: Sign the app (ad-hoc)
|
||||
run: codesign --force --deep --sign - dist/KaTrain.app
|
||||
|
||||
- name: Create DMG
|
||||
run: |
|
||||
mkdir -p dmg_temp
|
||||
cp -R dist/KaTrain.app dmg_temp/
|
||||
ln -s /Applications dmg_temp/Applications
|
||||
hdiutil create -volname "KaTrain ${{ env.KATRAIN_VERSION }}" \
|
||||
-srcfolder dmg_temp \
|
||||
-ov \
|
||||
-format UDZO \
|
||||
"KaTrain-${{ env.KATRAIN_VERSION }}.dmg"
|
||||
mkdir -p osx_app
|
||||
mv "KaTrain-${{ env.KATRAIN_VERSION }}.dmg" osx_app/
|
||||
|
||||
- name: Upload macOS artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: KaTrainMacOS-${{ env.KATRAIN_VERSION }}
|
||||
path: osx_app
|
||||
|
||||
# This job publishes the package to PyPI.
|
||||
publish-pypi:
|
||||
needs: test
|
||||
runs-on: ubuntu-latest
|
||||
if: github.event_name == 'workflow_dispatch' && github.event.inputs.publish_pypi == 'true'
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Python and uv
|
||||
uses: ./.github/actions/setup-python-uv
|
||||
with:
|
||||
sync-groups: dev,test
|
||||
|
||||
- name: Finalize I18N for publishing
|
||||
run: uv run python i18n.py
|
||||
|
||||
- name: Build and publish to PyPI
|
||||
env:
|
||||
# Assumes you are using trusted publishing or a PYPI_TOKEN secret
|
||||
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
|
||||
run: |
|
||||
uv build
|
||||
uv publish --verbose
|
||||
|
||||
# This job creates a draft release on GitHub.
|
||||
create-release:
|
||||
needs: [prepare, build-windows, build-macos]
|
||||
runs-on: ubuntu-latest
|
||||
if: github.event_name == 'workflow_dispatch' && github.event.inputs.create_release == 'true'
|
||||
permissions:
|
||||
contents: write # Required for softprops/action-gh-release
|
||||
steps:
|
||||
- name: Download all build artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
path: ./artifacts
|
||||
pattern: KaTrain*
|
||||
merge-multiple: true
|
||||
|
||||
- name: Create Draft Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: "v${{ needs.prepare.outputs.version }}"
|
||||
name: "KaTrain v${{ needs.prepare.outputs.version }}"
|
||||
body: |
|
||||
## KaTrain v${{ needs.prepare.outputs.version }}
|
||||
Auto-generated draft release from the latest main branch.
|
||||
|
||||
### Downloads
|
||||
- **Windows**: Download the `.exe` files or `.zip` folders.
|
||||
- **macOS**: Download the `.dmg` file.
|
||||
files: ./artifacts/*
|
||||
draft: true
|
||||
prerelease: false
|
||||
Reference in new issue
Block a user