From 0a8c1552e3133ff4606badea6b6b916648fffdc1 Mon Sep 17 00:00:00 2001 From: Ultrasonic1209 <44583181+Ultrasonic1209@users.noreply.github.com> Date: Fri, 7 Apr 2023 21:10:35 +0100 Subject: [PATCH 1/4] Build nutika from source as opposed to using pypi --- .github/workflows/ci.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 310b430..d3e1e71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,13 +118,24 @@ jobs: RAW_BRANCH=${{ github.ref_name || github.head_ref }} BRANCH=${RAW_BRANCH//\//-} echo "BRANCH=$BRANCH" >> $GITHUB_ENV - - name: Install dependencies and build + - name: Checkout Nutika + uses: actions/checkout@v3 + with: + repository: Nuitka/Nuitka + path: nutika + - name: Checkout Nutika on latest tag and install + working-directory: ./nutika + run: | + LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`) + git checkout $LATEST_TAG + python3 -m pip install -e . + - name: Install other dependencies and build run: | # required to use `python3` here as otherwise the venv is created with python 3.9 python3 -m pip install pipx python3 -m pipx run poetry install --no-interaction --with compile -E gui ./.venv/Scripts/activate.ps1 - # pip install nuitka minecraft_launcher_lib PySide6 click tomli darkdetect + # pip install minecraft_launcher_lib PySide6 click tomli darkdetect echo '__version__ = "${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }}"' | Out-File vanilla_installer/__init__.py pyside6-rcc vanilla_installer/assets/fonts.qrc -o vanilla_installer/fonts.py python -m nuitka --standalone --onefile --windows-icon-from-ico=media/icon.ico --output-dir=build --include-package=minecraft_launcher_lib,PySide6,click,tomli,darkdetect -o "Vanilla Installer-GUI ${{ env.BRANCH }}+${{ steps.short-sha.outputs.sha }}.exe" --enable-plugin=pyside6 --include-data-dir=vanilla_installer/assets=assets/ --disable-console --nofollow-import-to=PySide6.examples vanilla_installer/gui.py --assume-yes-for-downloads From a808a07d9da6bee6768f696976705beb05288646 Mon Sep 17 00:00:00 2001 From: Ultrasonic1209 <44583181+Ultrasonic1209@users.noreply.github.com> Date: Fri, 7 Apr 2023 21:25:59 +0100 Subject: [PATCH 2/4] Action isn't running under bash --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3e1e71..c0de711 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,8 +126,7 @@ jobs: - name: Checkout Nutika on latest tag and install working-directory: ./nutika run: | - LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`) - git checkout $LATEST_TAG + git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) python3 -m pip install -e . - name: Install other dependencies and build run: | From 5b854a4935d744af74d74f4a06894db2ccb1ed32 Mon Sep 17 00:00:00 2001 From: Ultrasonic1209 <44583181+Ultrasonic1209@users.noreply.github.com> Date: Fri, 7 Apr 2023 21:30:45 +0100 Subject: [PATCH 3/4] Tag history, please --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0de711..046f367 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,6 +123,7 @@ jobs: with: repository: Nuitka/Nuitka path: nutika + fetch-depth: '0' - name: Checkout Nutika on latest tag and install working-directory: ./nutika run: | From 7a7231f0f43de6134e711d8f8e9aab9b1b7115c6 Mon Sep 17 00:00:00 2001 From: Ultrasonic1209 <44583181+Ultrasonic1209@users.noreply.github.com> Date: Fri, 7 Apr 2023 22:48:21 +0100 Subject: [PATCH 4/4] Correct spelling error --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 046f367..bb90fe9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,14 +118,14 @@ jobs: RAW_BRANCH=${{ github.ref_name || github.head_ref }} BRANCH=${RAW_BRANCH//\//-} echo "BRANCH=$BRANCH" >> $GITHUB_ENV - - name: Checkout Nutika + - name: Checkout Nuitka uses: actions/checkout@v3 with: repository: Nuitka/Nuitka - path: nutika + path: Nuitka fetch-depth: '0' - - name: Checkout Nutika on latest tag and install - working-directory: ./nutika + - name: Checkout Nuitka on latest tag and install + working-directory: ./Nuitka run: | git checkout $(git describe --tags $(git rev-list --tags --max-count=1)) python3 -m pip install -e .