Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
os: [windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Nastavíme Python (bez toho by příkaz "python setup.py --version" nemusel fungovat)
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'

Expand All @@ -26,12 +26,18 @@ jobs:
python -m pip install --upgrade pip
pip install setuptools

# Získáme verzi z ForrestHub-app/setup.py
- name: Get version from setup.py
# Get version from VERSION file
- name: Get version from VERSION file
id: get_version
run: |
cd ForrestHub-app
echo "VERSION=$(python setup.py --version)" >> $GITHUB_ENV
if [ "$RUNNER_OS" == "Windows" ]; then
VERSION=$(type VERSION)
else
VERSION=$(cat VERSION)
fi
echo "VERSION=$VERSION" >> $GITHUB_ENV
shell: bash

- name: Install dependencies
run: |
Expand Down Expand Up @@ -89,5 +95,5 @@ jobs:
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./ForrestHub-macOS/ForrestHub
asset_name: ForrestHub-macOS
asset_name: ForrestHub-${{ env.VERSION }}-macOS
asset_content_type: application/octet-stream
22 changes: 11 additions & 11 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
permissions: write-all
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'

Expand All @@ -28,11 +28,11 @@ jobs:
python -m pip install --upgrade pip
pip install setuptools

# Načtení verze z ForrestHub-app/setup.py a zjištění data (PowerShell)
# Get version from VERSION file and date (PowerShell)
- name: Get version and date
run: |
cd ForrestHub-app
$version = python setup.py --version
$version = Get-Content VERSION
echo "VERSION=$version" >> $env:GITHUB_ENV
$dateStr = Get-Date -Format "yyyyMMdd"
echo "DATESTR=$dateStr" >> $env:GITHUB_ENV
Expand Down Expand Up @@ -60,30 +60,30 @@ jobs:
permissions: write-all
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'

# Install setuptools
- name: Install setuptools
# Install Hatch
- name: Install Hatch
run: |
python -m pip install --upgrade pip
pip install setuptools

# Načtení verze z ForrestHub-app/setup.py a zjištění data (bash)
# Get version from VERSION file and date (bash)
- name: Get version and date
run: |
cd ForrestHub-app
VERSION=$(python setup.py --version)
VERSION=$(cat VERSION)
echo "VERSION=$VERSION" >> $GITHUB_ENV
DATESTR=$(date +'%Y%m%d')
echo "DATESTR=$DATESTR" >> $GITHUB_ENV
shell: bash

- name: Install dependencies
- name: Install dependencies and build
run: |
python -m pip install --upgrade pip
cd ForrestHub-app
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
branches:
- master
- main

permissions:
contents: write
jobs:
Expand Down
24 changes: 24 additions & 0 deletions ForrestHub-app/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
include VERSION
include requirements.txt
include *.conf.py
include *.spec
include *.cfg
include *.ini
include *.json
include *.pem
include *.key
include *.crt
recursive-include assets *
recursive-include templates *
recursive-include pages *
recursive-include games *
recursive-include docs *
global-exclude *.pyc
global-exclude __pycache__
global-exclude .git*
global-exclude .DS_Store
global-exclude *.log
global-exclude .venv
global-exclude build
global-exclude dist
global-exclude *.egg-info
2 changes: 1 addition & 1 deletion ForrestHub-app/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.0
1.6.0
Loading
Loading