applying it to the other systems

EchterAlsFake · Jun 7, 2024 · 6a2458f · 6a2458f
1 parent 35c5569
commit 6a2458f
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 88 deletions.
diff --git a/.github/workflows/build_cli_windows.yml b/.github/workflows/build_cli_windows.yml
@@ -27,13 +27,13 @@ jobs:
           pip install -r requirements_cli.txt
       - name: Build Porn Fetch (CLI - Windows - X64) (PyInstaller)
         run: |
-          pyinstaller -F Porn_Fetch_CLI.py
+          pyinstaller -F Porn_Fetch_CLI.py && cd dist && mv Porn_Fetch_CLI.exe PornFetch_Windows_CLI_x64.exe
 
       - name: Archive Porn Fetch CLI (Windows X64) build
         uses: actions/upload-artifact@v2
         with:
-          name: PornFetch_CLI_Windows_x64
-          path: dist/Porn_Fetch_CLI.exe
+          name: PornFetch_Windows_CLI_x64
+          path: dist/PornFetch_Windows_CLI_x64.exe
 
   build-pornfetch-cli-windows-x32:
     runs-on: windows-latest
@@ -53,13 +53,13 @@ jobs:
           pip install -r requirements_cli.txt
       - name: Build Porn Fetch (CLI - Windows - X32) (PyInstaller)
         run: |
-          pyinstaller -F Porn_Fetch_CLI.py
+          pyinstaller -F Porn_Fetch_CLI.py && cd dist && mv Porn_Fetch_CLI.exe PornFetch_Windows_CLI_x32.exe
 
       - name: Archive Porn Fetch CLI (Windows X32) build
         uses: actions/upload-artifact@v2
         with:
-          name: PornFetch_CLI_Windows_x32
-          path: dist/Porn_Fetch_CLI.exe
+          name: PornFetch_Windows_CLI_x32
+          path: dist/PornFetch_Windows_CLI_x32.exe
 
   create-release:
     needs: [build-pornfetch-cli-windows-x64, build-pornfetch-cli-windows-x32]
@@ -79,65 +79,98 @@ jobs:
       - name: Download Windows x64 artifact
         uses: actions/download-artifact@v2
         with:
-          name: PornFetch_CLI_Windows_x64
+          name: PornFetch_Windows_CLI_x64
           path: ./artifacts
 
       - name: Download Windows x32 artifact
         uses: actions/download-artifact@v2
         with:
-          name: PornFetch_CLI_Windows_x32
+          name: PornFetch_Windows_CLI_x32
           path: ./artifacts
 
+      - name: List artifacts directory
+        run: ls -R ./artifacts
+
       - name: Get short SHA
         id: vars
         run: echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
 
+      - name: Verify PAT
+        run: |
+          curl -H "Authorization: token ${{ secrets.PAT }}" https://api.github.com/user
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+
       - name: Check if Release Exists
         id: check_release
         run: |
-          gh release view v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }} >/dev/null 2>&1 && echo "RELEASE_EXISTS=true" || echo "RELEASE_EXISTS=false"
+          if gh release view v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }} >/dev/null 2>&1; then
+            echo "RELEASE_EXISTS=true" >> $GITHUB_ENV
+            echo "::set-output name=release_exists::true"
+          else
+            echo "RELEASE_EXISTS=false" >> $GITHUB_ENV
+            echo "::set-output name=release_exists::false"
+          fi
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
 
-      - name: Set RELEASE_EXISTS
-        run: echo "RELEASE_EXISTS=${{ steps.check_release.outputs.RELEASE_EXISTS }}" >> $GITHUB_ENV
+      - name: Calculate SHA512 for Windows x64
+        id: sha512_windows_x64
+        run: |
+          sha512sum ./artifacts/PornFetch_Windows_CLI_x64.exe | awk '{ print $1 }' > sha512_windows_x64.txt
+          echo "sha512_windows_x64=$(cat sha512_windows_x64.txt)" >> $GITHUB_ENV
+
+      - name: Calculate SHA512 for Windows x32
+        id: sha512_windows_x32
+        run: |
+          sha512sum ./artifacts/PornFetch_Windows_CLI_x32.exe | awk '{ print $1 }' > sha512_windows_x32.txt
+          echo "sha512_windows_x32=$(cat sha512_windows_x32.txt)" >> $GITHUB_ENV
 
       - name: Create GitHub Release
         id: create_release
-        if: steps.check_release.outputs.RELEASE_EXISTS == 'false'
+        if: steps.check_release.outputs.release_exists == 'false'
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
+          SHA512_WINDOWS_X64: ${{ env.sha512_windows_x64 }}
+          SHA512_WINDOWS_X32: ${{ env.sha512_windows_x32 }}
         with:
-          tag_name: v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }}
-          release_name: Automated Release v1.0.0-${{ env.GITHUB_SHA_SHORT }}
+          tag_name: v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }}
+          release_name: Automated Release v${{ secrets.VERSION }}-${{ env.GITHUB_SHA_SHORT }}
           body: |
             This is an automated release generated by the CI/CD pipeline.
+            SHA512 Checksums:
+            - PornFetch_Windows_CLI_x64: ${{ env.SHA512_WINDOWS_X64 }}
+            - PornFetch_Windows_CLI_x32: ${{ env.SHA512_WINDOWS_X32 }}
           draft: false
           prerelease: true
 
       - name: Get Release Upload URL
-        if: steps.check_release.outputs.RELEASE_EXISTS == 'true'
         id: get_release_url
         run: |
-          UPLOAD_URL=$(gh release view v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }} --json upload_url --jq .upload_url)
+          UPLOAD_URL=$(gh release view v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }} --json uploadUrl --jq .uploadUrl)
           echo "UPLOAD_URL=$UPLOAD_URL" >> $GITHUB_ENV
+          echo "::set-output name=upload_url::$UPLOAD_URL"
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
         shell: bash
 
       - name: Upload Windows x64 artifact to release
         uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url || steps.get_release_url.outputs.upload_url }}
-          asset_path: ./artifacts/Porn_Fetch_CLI.exe
-          asset_name: PornFetch_CLI_Windows_x64.exe
+          upload_url: ${{ steps.get_release_url.outputs.upload_url }}
+          asset_path: ./artifacts/PornFetch_Windows_CLI_x64.exe
+          asset_name: PornFetch_Windows_CLI_x64.exe
           asset_content_type: application/octet-stream
 
       - name: Upload Windows x32 artifact to release
         uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url || steps.get_release_url.outputs.upload_url }}
-          asset_path: ./artifacts/Porn_Fetch_CLI.exe
-          asset_name: PornFetch_CLI_Windows_x32.exe
+          upload_url: ${{ steps.get_release_url.outputs.upload_url }}
+          asset_path: ./artifacts/PornFetch_Windows_CLI_x32.exe
+          asset_name: PornFetch_Windows_CLI_x32.exe
           asset_content_type: application/octet-stream
diff --git a/.github/workflows/build_gui_linux.yml b/.github/workflows/build_gui_linux.yml
@@ -51,7 +51,8 @@ jobs:
     needs: build-pornfetch-gui-linux-x64
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
 
       - name: Install gh CLI
         run: |
@@ -67,48 +68,71 @@ jobs:
           name: pyside6-application-x64
           path: ./artifacts
 
+      - name: List artifacts directory
+        run: ls -R ./artifacts
+
       - name: Get short SHA
         id: vars
         run: echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
 
+      - name: Verify PAT
+        run: |
+          curl -H "Authorization: token ${{ secrets.PAT }}" https://api.github.com/user
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+
       - name: Check if Release Exists
         id: check_release
         run: |
-          gh release view v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }} >/dev/null 2>&1 && echo "RELEASE_EXISTS=true" || echo "RELEASE_EXISTS=false"
+          if gh release view v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }} >/dev/null 2>&1; then
+            echo "RELEASE_EXISTS=true" >> $GITHUB_ENV
+            echo "::set-output name=release_exists::true"
+          else
+            echo "RELEASE_EXISTS=false" >> $GITHUB_ENV
+            echo "::set-output name=release_exists::false"
+          fi
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
 
-      - name: Set RELEASE_EXISTS
-        run: echo "RELEASE_EXISTS=${{ steps.check_release.outputs.RELEASE_EXISTS }}" >> $GITHUB_ENV
+      - name: Calculate SHA512 for Linux x64
+        id: sha512_linux_x64
+        run: |
+          sha512sum ./artifacts/main.bin | awk '{ print $1 }' > sha512_linux_x64.txt
+          echo "sha512_linux_x64=$(cat sha512_linux_x64.txt)" >> $GITHUB_ENV
 
       - name: Create GitHub Release
         id: create_release
-        if: steps.check_release.outputs.RELEASE_EXISTS == 'false'
+        if: steps.check_release.outputs.release_exists == 'false'
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
+          SHA512_LINUX_X64: ${{ env.sha512_linux_x64 }}
         with:
-          tag_name: v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }}
-          release_name: Automated Release v1.0.0-${{ env.GITHUB_SHA_SHORT }}
+          tag_name: v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }}
+          release_name: Automated Release v${{ secrets.VERSION }}-${{ env.GITHUB_SHA_SHORT }}
           body: |
             This is an automated release generated by the CI/CD pipeline.
+            SHA512 Checksums:
+            - PornFetch_GUI_Linux_x64: ${{ env.SHA512_LINUX_X64 }}
           draft: false
           prerelease: true
 
       - name: Get Release Upload URL
-        if: steps.check_release.outputs.RELEASE_EXISTS == 'true'
         id: get_release_url
         run: |
-          UPLOAD_URL=$(gh release view v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }} --json upload_url --jq .upload_url)
+          UPLOAD_URL=$(gh release view v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }} --json uploadUrl --jq .uploadUrl)
           echo "UPLOAD_URL=$UPLOAD_URL" >> $GITHUB_ENV
+          echo "::set-output name=upload_url::$UPLOAD_URL"
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
         shell: bash
 
       - name: Upload Linux x64 artifact to release
         uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url || steps.get_release_url.outputs.upload_url }}
+          upload_url: ${{ steps.get_release_url.outputs.upload_url }}
           asset_path: ./artifacts/main.bin
           asset_name: PornFetch_GUI_Linux_x64.bin
-          asset_content_type: application/octet-stream
+          asset_content_type: application/octet-stream
diff --git a/.github/workflows/build_gui_macos.yml b/.github/workflows/build_gui_macos.yml
@@ -39,8 +39,7 @@ jobs:
           pyside6-deploy -c src/build/pysidedeploy_macos.spec main.py
 
       - name: List output directory
-        run: |
-          ls -R deploy/
+        run: ls -R deploy/
 
       - name: Archive macOS build
         uses: actions/upload-artifact@v2
@@ -69,65 +68,71 @@ jobs:
           name: pyside6-application-macos
           path: ./artifacts
 
+      - name: List artifacts directory
+        run: ls -R ./artifacts
+
       - name: Get short SHA
         id: vars
         run: echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
 
+      - name: Verify PAT
+        run: |
+          curl -H "Authorization: token ${{ secrets.PAT }}" https://api.github.com/user
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+
       - name: Check if Release Exists
         id: check_release
         run: |
-          gh release view v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }} >/dev/null 2>&1 && echo "RELEASE_EXISTS=true" || echo "RELEASE_EXISTS=false"
+          if gh release view v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }} >/dev/null 2>&1; then
+            echo "RELEASE_EXISTS=true" >> $GITHUB_ENV
+            echo "::set-output name=release_exists::true"
+          else
+            echo "RELEASE_EXISTS=false" >> $GITHUB_ENV
+            echo "::set-output name=release_exists::false"
+          fi
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
 
-      - name: Set RELEASE_EXISTS
-        run: echo "RELEASE_EXISTS=${{ steps.check_release.outputs.RELEASE_EXISTS }}" >> $GITHUB_ENV
+      - name: Calculate SHA512 for MacOS
+        id: sha512_macos
+        run: |
+          sha512sum ./artifacts/main.app | awk '{ print $1 }' > sha512_macos.txt
+          echo "sha512_macos=$(cat sha512_macos.txt)" >> $GITHUB_ENV
 
       - name: Create GitHub Release
         id: create_release
-        if: steps.check_release.outputs.RELEASE_EXISTS == 'false'
+        if: steps.check_release.outputs.release_exists == 'false'
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
+          SHA512_MACOS: ${{ env.sha512_macos }}
         with:
-          tag_name: v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }}
-          release_name: Automated Release v1.0.0-${{ env.GITHUB_SHA_SHORT }}
+          tag_name: v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }}
+          release_name: Automated Release v${{ secrets.VERSION }}-${{ env.GITHUB_SHA_SHORT }}
           body: |
             This is an automated release generated by the CI/CD pipeline.
+            SHA512 Checksums:
+            - PornFetch_GUI_MacOS_x64: ${{ env.SHA512_MACOS }}
           draft: false
           prerelease: true
 
       - name: Get Release Upload URL
-        if: steps.check_release.outputs.RELEASE_EXISTS == 'true'
         id: get_release_url
         run: |
-          UPLOAD_URL=$(gh release view v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }} --json upload_url --jq .upload_url)
+          UPLOAD_URL=$(gh release view v${{ secrets.VERSION }}-automated-${{ env.GITHUB_SHA_SHORT }} --json uploadUrl --jq .uploadUrl)
           echo "UPLOAD_URL=$UPLOAD_URL" >> $GITHUB_ENV
+          echo "::set-output name=upload_url::$UPLOAD_URL"
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}
         shell: bash
 
-      - name: Get Release Upload URL
-        if: env.RELEASE_EXISTS == 'true'
-        id: get_release_url
-        run: |
-          UPLOAD_URL=$(gh release view v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }} --json upload_url --jq .upload_url)
-          echo "UPLOAD_URL=$UPLOAD_URL" >> $GITHUB_ENV
-        env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
-        shell: bash
-
-      - name: Set Release Upload URL
-        if: env.RELEASE_EXISTS == 'true'
-        run: echo "UPLOAD_URL=$(gh release view v1.0.0-automated-${{ env.GITHUB_SHA_SHORT }} --json upload_url --jq .upload_url)" >> $GITHUB_ENV
-        env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
-
-
       - name: Upload macOS artifact to release
         uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url || steps.get_release_url.outputs.upload_url }}
+          upload_url: ${{ steps.get_release_url.outputs.upload_url }}
           asset_path: ./artifacts/main.app
           asset_name: PornFetch_GUI_MacOS_x64.app
           asset_content_type: application/octet-stream