From 13a7efa5b2ed11bf15756133cad38c08936bbfcf Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Sat, 30 Nov 2024 10:46:05 +0100 Subject: [PATCH 01/11] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..5a6f32a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "pip" + directory: "/" # Location of package manifests + schedule: + interval: "weekly" From 6ab9585837c0412aa93ca10bfecf190df37428f8 Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:53:59 +0100 Subject: [PATCH 02/11] add spec file --- .gitignore | 2 +- RevPi Commander.spec | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 RevPi Commander.spec diff --git a/.gitignore b/.gitignore index 0bd544e..49874f7 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ MANIFEST # Usually these files are written by a python script from a template # before PyInstaller builds the exe, so as to inject date/other infos into it. *.manifest -*.spec + # Installer logs pip-log.txt diff --git a/RevPi Commander.spec b/RevPi Commander.spec new file mode 100644 index 0000000..2f51a56 --- /dev/null +++ b/RevPi Commander.spec @@ -0,0 +1,45 @@ +# -*- mode: python ; coding: utf-8 -*- + + +a = Analysis( + ['src\\revpicommander\\__main__.py'], + pathex=[], + binaries=[], + datas=[('dist/bundled-libraries.md', 'revpicommander\\open-source-licenses'), ('dist/open-source-licenses.*', 'revpicommander\\open-source-licenses'), ('src\\revpicommander\\locale', '.\\revpicommander\\locale'), ('data\\revpicommander.ico', '.')], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + noarchive=False, + optimize=0, +) +pyz = PYZ(a.pure) + +exe = EXE( + pyz, + a.scripts, + [], + exclude_binaries=True, + name='RevPi Commander', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=False, + disable_windowed_traceback=False, + argv_emulation=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None, + icon=['data\\revpicommander.ico'], +) +coll = COLLECT( + exe, + a.binaries, + a.datas, + strip=False, + upx=True, + upx_exclude=[], + name='RevPi Commander', +) From 06b9403dbd9ee2c67ac1a30760bb1596567caeb2 Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:55:04 +0100 Subject: [PATCH 03/11] add action --- .github/actions/build.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/actions/build.yml diff --git a/.github/actions/build.yml b/.github/actions/build.yml new file mode 100644 index 0000000..bff8515 --- /dev/null +++ b/.github/actions/build.yml @@ -0,0 +1,12 @@ +name: binary_creation +on: [pull_request, push] +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: generate exe + uses: JackMcKew/pyinstaller-action-windows@main + with: + spec: RevPi Commander.spec + path: . \ No newline at end of file From 9f459e58b72b7d54705e613b600daa995eb65b37 Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:57:30 +0100 Subject: [PATCH 04/11] Create main.yml --- .github/workflows/main.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..002c709 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,12 @@ +name: binary_creation +on: [pull_request, push] +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: generate exe + uses: JackMcKew/pyinstaller-action-windows@main + with: + spec: RevPi Commander.spec + path: . From 9cb89fec39a35d2a0e1b3139df9b2b8968b25cc4 Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:16:28 +0100 Subject: [PATCH 05/11] adapt workflow --- .github/actions/build.yml | 12 ------------ .github/workflows/main.yml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 .github/actions/build.yml diff --git a/.github/actions/build.yml b/.github/actions/build.yml deleted file mode 100644 index bff8515..0000000 --- a/.github/actions/build.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: binary_creation -on: [pull_request, push] -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: generate exe - uses: JackMcKew/pyinstaller-action-windows@main - with: - spec: RevPi Commander.spec - path: . \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 002c709..9dd964a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,5 +8,5 @@ jobs: - name: generate exe uses: JackMcKew/pyinstaller-action-windows@main with: - spec: RevPi Commander.spec + spec: "RevPi Commander.spec" path: . From 12aaf18834ecf134f1b8a65279aa6719c2f5d87c Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:22:03 +0100 Subject: [PATCH 06/11] rename spec file --- .github/workflows/main.yml | 2 +- RevPi Commander.spec => RevPi_Commander.spec | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename RevPi Commander.spec => RevPi_Commander.spec (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9dd964a..8e0ec17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,5 +8,5 @@ jobs: - name: generate exe uses: JackMcKew/pyinstaller-action-windows@main with: - spec: "RevPi Commander.spec" + spec: RevPi_Commander.spec path: . diff --git a/RevPi Commander.spec b/RevPi_Commander.spec similarity index 100% rename from RevPi Commander.spec rename to RevPi_Commander.spec From 481d0ea4b989c7cf7d5982c4fe35d1f081a3ceaf Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:36:42 +0100 Subject: [PATCH 07/11] extend action --- .github/workflows/main.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e0ec17..fdc4a29 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,8 +5,31 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: generate license + run: python -m piplicenses ^ + --format=markdown ^ + --output-file dist/bundled-libraries.md + - name: generate license2 + run: python -m piplicenses ^ + --with-authors ^ + --with-urls ^ + --with-description ^ + --with-license-file ^ + --no-license-path ^ + --format=json ^ + --output-file dist/open-source-licenses.json + - name: generate license3 + run: python -m piplicenses ^ + --with-authors ^ + --with-urls ^ + --with-description ^ + --with-license-file ^ + --no-license-path ^ + --format=plain-vertical ^ + --output-file dist/open-source-licenses.txt - name: generate exe uses: JackMcKew/pyinstaller-action-windows@main with: spec: RevPi_Commander.spec path: . + From b98226c6a6cc68316fe0d8358826120fb32cf1cb Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:41:03 +0100 Subject: [PATCH 08/11] install dependencies --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdc4a29..660f795 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Install Python dependencies + uses: py-actions/py-dependency-install@v4 - name: generate license run: python -m piplicenses ^ --format=markdown ^ From 1ee167fe0d04715acc9c54e70f44ba2d2aac913f Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:42:48 +0100 Subject: [PATCH 09/11] fix syntax --- .github/workflows/main.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 660f795..4ac32f1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,26 +8,26 @@ jobs: - name: Install Python dependencies uses: py-actions/py-dependency-install@v4 - name: generate license - run: python -m piplicenses ^ - --format=markdown ^ + run: python -m piplicenses + --format=markdown --output-file dist/bundled-libraries.md - name: generate license2 - run: python -m piplicenses ^ - --with-authors ^ - --with-urls ^ - --with-description ^ - --with-license-file ^ - --no-license-path ^ - --format=json ^ + run: python -m piplicenses + --with-authors + --with-urls + --with-description + --with-license-file + --no-license-path + --format=json --output-file dist/open-source-licenses.json - name: generate license3 - run: python -m piplicenses ^ - --with-authors ^ - --with-urls ^ - --with-description ^ - --with-license-file ^ - --no-license-path ^ - --format=plain-vertical ^ + run: python -m piplicenses + --with-authors + --with-urls + --with-description + --with-license-file + --no-license-path + --format=plain-vertical --output-file dist/open-source-licenses.txt - name: generate exe uses: JackMcKew/pyinstaller-action-windows@main From 9c0150e92946a1cd1761efadde7c948e38d2bc38 Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:52:07 +0100 Subject: [PATCH 10/11] adapt action --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ac32f1..a106a0d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,6 +7,8 @@ jobs: - uses: actions/checkout@v4 - name: Install Python dependencies uses: py-actions/py-dependency-install@v4 + - name: create temp folder + run: mkdir dist - name: generate license run: python -m piplicenses --format=markdown From 7c48aa95b55edb8a146a9ad780d727eededb28e1 Mon Sep 17 00:00:00 2001 From: security-companion <11234621+security-companion@users.noreply.github.com> Date: Tue, 3 Dec 2024 09:13:08 +0100 Subject: [PATCH 11/11] publish files --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a106a0d..2ab2edc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,4 +36,8 @@ jobs: with: spec: RevPi_Commander.spec path: . - + - name: upload files + uses: actions/upload-artifact@v4 + with: + name: binaries + path: dist/