From 1ff6c37159389e0636560fc7483e5f58a67b8d33 Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 10:33:45 +0100 Subject: [PATCH 01/10] Create pyinstaller.yml --- .github/workflows/pyinstaller.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/pyinstaller.yml diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml new file mode 100644 index 00000000..3a554ddf --- /dev/null +++ b/.github/workflows/pyinstaller.yml @@ -0,0 +1,16 @@ +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: PyInstaller Windows + uses: JackMcKew/pyinstaller-action-windows@python3-10-pyinstaller-5-3 + with: + path: . + + - uses: actions/upload-artifact@v2 + with: + name: loki.exe + path: src/dist/windows # or path/to/artifact \ No newline at end of file From 238cc21573c92093353fa51e5fd9b61157a5549c Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 10:35:15 +0100 Subject: [PATCH 02/10] update action --- .github/workflows/pyinstaller.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index 3a554ddf..5ad80cd7 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -4,13 +4,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: PyInstaller Windows uses: JackMcKew/pyinstaller-action-windows@python3-10-pyinstaller-5-3 with: path: . - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: loki.exe path: src/dist/windows # or path/to/artifact \ No newline at end of file From a807f9c7faff265ed1a3b234d7bdb3c8b3127a64 Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 10:42:53 +0100 Subject: [PATCH 03/10] update pyinstaller --- .github/workflows/pyinstaller.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index 5ad80cd7..2d770d0c 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -1,15 +1,14 @@ +name: binary_creation +on: [pull_request, push] jobs: build: - runs-on: ubuntu-latest - steps: - uses: actions/checkout@v4 - name: PyInstaller Windows uses: JackMcKew/pyinstaller-action-windows@python3-10-pyinstaller-5-3 with: path: . - - uses: actions/upload-artifact@v4 with: name: loki.exe From a8dbba214243d1890601ba91b7e656034adfedaf Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 10:46:44 +0100 Subject: [PATCH 04/10] update action --- .github/workflows/pyinstaller.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index 2d770d0c..a8ec6aa1 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -6,7 +6,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: PyInstaller Windows - uses: JackMcKew/pyinstaller-action-windows@python3-10-pyinstaller-5-3 + uses: JackMcKew/pyinstaller-action-windows@main with: path: . - uses: actions/upload-artifact@v4 From 25ef18248076a98b3a6d8f3c20dc6e0ce8b8a5b5 Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 10:52:06 +0100 Subject: [PATCH 05/10] update action --- .github/workflows/pyinstaller.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index a8ec6aa1..4edc3ac7 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -8,8 +8,9 @@ jobs: - name: PyInstaller Windows uses: JackMcKew/pyinstaller-action-windows@main with: + spec: loki.spec path: . - uses: actions/upload-artifact@v4 with: name: loki.exe - path: src/dist/windows # or path/to/artifact \ No newline at end of file + path: dist/windows \ No newline at end of file From 0fdc62e6ca7bd54cec66c51cde04662d0d24488f Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 11:02:27 +0100 Subject: [PATCH 06/10] add upgrader to action --- .github/workflows/pyinstaller.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index 4edc3ac7..9b7b69bc 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -5,12 +5,21 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: PyInstaller Windows + - name: generate loki.exe uses: JackMcKew/pyinstaller-action-windows@main with: spec: loki.spec path: . + - name: generate loki-uprader.exe + uses: JackMcKew/pyinstaller-action-windows@main + with: + spec: loki-upgrader.spec + path: . - uses: actions/upload-artifact@v4 with: name: loki.exe + path: dist/windows + - uses: actions/upload-artifact@v4 + with: + name: loki-upgrader.exe path: dist/windows \ No newline at end of file From 359be81672b49470bd1dc6183ce78121316ea056 Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 11:14:35 +0100 Subject: [PATCH 07/10] update action --- .github/workflows/pyinstaller.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index 9b7b69bc..c45a1669 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -15,11 +15,10 @@ jobs: with: spec: loki-upgrader.spec path: . - - uses: actions/upload-artifact@v4 + - name: copy additional files + run: copy .\tools\pe-sieve*.exe dist/windows + - name: upload files + uses: actions/upload-artifact@v4 with: - name: loki.exe - path: dist/windows - - uses: actions/upload-artifact@v4 - with: - name: loki-upgrader.exe + name: loki-binaries path: dist/windows \ No newline at end of file From 0aa3ff2beeae9de90d5b5e94724bc5fc0a3880eb Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 11:43:33 +0100 Subject: [PATCH 08/10] fix syntax --- .github/workflows/pyinstaller.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index c45a1669..9f37809f 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -16,7 +16,11 @@ jobs: spec: loki-upgrader.spec path: . - name: copy additional files - run: copy .\tools\pe-sieve*.exe dist/windows + run: cp tools/pe-sieve*.exe dist/windows + - name: zip files + uses: edgarrc/action-7z@v1 + with: + args: 7z a -tzip -mm=Deflate -mmt=off -mx5 -mfb=32 -mpass=1 -sccUTF-8 -mem=AES256 build.7z dist/windows - name: upload files uses: actions/upload-artifact@v4 with: From fea70bb391c37c4a28b251f8773004e9f5af58b4 Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 11:51:50 +0100 Subject: [PATCH 09/10] fix path --- .github/workflows/pyinstaller.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index 9f37809f..0ca3077a 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -16,7 +16,7 @@ jobs: spec: loki-upgrader.spec path: . - name: copy additional files - run: cp tools/pe-sieve*.exe dist/windows + run: cp tools/pe-sieve*.exe dist/windows/tools - name: zip files uses: edgarrc/action-7z@v1 with: From 9881b0bd3709e01a892cf5f5d53a3d8030ee2cef Mon Sep 17 00:00:00 2001 From: security-companion Date: Sat, 23 Nov 2024 11:56:00 +0100 Subject: [PATCH 10/10] create subdir --- .github/workflows/pyinstaller.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pyinstaller.yml b/.github/workflows/pyinstaller.yml index 0ca3077a..01213a91 100644 --- a/.github/workflows/pyinstaller.yml +++ b/.github/workflows/pyinstaller.yml @@ -15,6 +15,8 @@ jobs: with: spec: loki-upgrader.spec path: . + - name: create subdir + run: mkdir dist/windows/tools - name: copy additional files run: cp tools/pe-sieve*.exe dist/windows/tools - name: zip files