From 6a741bbb88fe4f730ba09436148b5075d1a033e5 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 25 Oct 2022 02:06:11 -0400 Subject: [PATCH 1/8] Use icon from executable --- plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.json b/plugin.json index 25b16bd..51c1888 100644 --- a/plugin.json +++ b/plugin.json @@ -7,6 +7,6 @@ "Version": "7.0.0", "Language": "executable", "Website": "https://github.com/Garulf/Steam-Search", - "IcoPath": "icon.png", + "IcoPath": "run.exe", "ExecuteFileName": "run.exe" } From 29285e04cfda2061228feac025e231cde1763ee9 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 25 Oct 2022 02:06:23 -0400 Subject: [PATCH 2/8] Minor version bump --- plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.json b/plugin.json index 51c1888..09cd215 100644 --- a/plugin.json +++ b/plugin.json @@ -4,7 +4,7 @@ "Name": "Steam Search", "Description": "Search and launch your Steam Game library", "Author": "Garulf", - "Version": "7.0.0", + "Version": "7.0.1", "Language": "executable", "Website": "https://github.com/Garulf/Steam-Search", "IcoPath": "run.exe", From fe611001859d7cac859d1361bbaf8676b5577f6e Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 25 Oct 2022 02:06:57 -0400 Subject: [PATCH 3/8] Install imageio dependency --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index 791b3df..0930e8c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,4 @@ nuitka==1.1.6 zstandard==0.18.0 ordered-set==4.1.0 +imageio==2.22.2 From ced68621a06515d42926c84805861c72d5d86e98 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 25 Oct 2022 02:09:16 -0400 Subject: [PATCH 4/8] Update cache keys to use python version --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4da245a..d74a567 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,14 +29,14 @@ jobs: if: startsWith(runner.os, 'Windows') with: path: ~\AppData\Local\pip\Cache - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} + key: ${{ runner.os }}-${{ env.PYTHON_VER }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - uses: actions/cache@v2 if: startsWith(runner.os, 'Windows') with: path: ~\AppData\Local\pip\Cache - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }} + key: ${{ runner.os }}-${{ env.PYTHON_VER }}-pip-${{ hashFiles('**/requirements-dev.txt') }} restore-keys: | ${{ runner.os }}-pip- - name: Install dependencies From effc5cc447976b7ae57d3f74cd215837e59270eb Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 25 Oct 2022 02:10:38 -0400 Subject: [PATCH 5/8] Name cache steps for better debugging --- .github/workflows/release.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d74a567..48a9b63 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,14 +25,16 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VER }} - - uses: actions/cache@v2 + - name: Cache plugin dependencies + uses: actions/cache@v2 if: startsWith(runner.os, 'Windows') with: path: ~\AppData\Local\pip\Cache key: ${{ runner.os }}-${{ env.PYTHON_VER }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - - uses: actions/cache@v2 + - name: Cache Build dependencies + uses: actions/cache@v2 if: startsWith(runner.os, 'Windows') with: path: ~\AppData\Local\pip\Cache From b1a70820b2904234c80fa8dfd18e6e5764b71c30 Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 25 Oct 2022 02:14:06 -0400 Subject: [PATCH 6/8] Skip pip install if cached --- .github/workflows/release.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48a9b63..51fcc15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,6 +26,7 @@ jobs: with: python-version: ${{ env.PYTHON_VER }} - name: Cache plugin dependencies + id: plugin-cache uses: actions/cache@v2 if: startsWith(runner.os, 'Windows') with: @@ -34,6 +35,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - name: Cache Build dependencies + id: build-cache uses: actions/cache@v2 if: startsWith(runner.os, 'Windows') with: @@ -41,11 +43,15 @@ jobs: key: ${{ runner.os }}-${{ env.PYTHON_VER }}-pip-${{ hashFiles('**/requirements-dev.txt') }} restore-keys: | ${{ runner.os }}-pip- - - name: Install dependencies + - name: Install Plugin dependencies + if: steps.plugin-cache.outputs.cache-hit != 'true' run: | python -m pip install --upgrade pip pip install wheel pip install -r ./requirements.txt + - name: Install Build dependencies + if: steps.build-cache.outputs.cache-hit != 'true' + run: | pip install -r ./requirements-dev.txt - name: Build run: | From 9faaab5849d06d4cefd86f0dc0dc24cc6c3e702f Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 25 Oct 2022 02:14:41 -0400 Subject: [PATCH 7/8] Remove png from release package --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 51fcc15..b126ed3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,6 @@ jobs: mkdir -p staging mv run.exe staging mv plugin.json staging - mv icon.png staging mv SettingsTemplate.yaml staging - name: Archive Release uses: thedoctor0/zip-release@main From 78376492de05c3b6b5d4849aa2431fb19354673d Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Tue, 25 Oct 2022 02:15:16 -0400 Subject: [PATCH 8/8] Embed icon when building --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b126ed3..35c3199 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,7 +55,7 @@ jobs: pip install -r ./requirements-dev.txt - name: Build run: | - python -m nuitka run.py --assume-yes-for-downloads --standalone --onefile + python -m nuitka run.py --assume-yes-for-downloads --standalone --onefile --windows-icon-from-ico=icon.png - name: Get Plugin's version id: version uses: notiz-dev/github-action-json-property@release