Update to v1.5.7.0

.github/workflows/compile.yml

@@ -3,24 +3,37 @@ name: Compile the project
 on:
   workflow_dispatch:
     inputs:
+      branch:
+        description: 'Branch to compile (e.g. main)'
+        required: true
+        default: 'main'
+        type: string
+      create_release:
+        description: 'Publish to Releases?'
+        required: true
+        type: boolean
+        default: false
       version:
         description: 'File version (e.g. 1.1.0.0)'
         required: true
+        type: string
       tagname:
         description: 'Tag name (e.g. 1.1.0.0-test)'
-        required: true
+        required: false
+        type: string
       release_name:
         description: 'Release name'
-        required: true
+        required: false
+        type: string
 
 jobs:
   macOS:
     runs-on: macos-latest
-    outputs:
-      artifact_mac: ${{ steps.upload.outputs.artifact_mac }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Set up Python
         uses: actions/setup-python@v5
@@ -33,19 +46,21 @@ jobs:
           python -m pip install charset_normalizer pyinstaller -r requirements.txt
           pyinstaller --onefile --clean --target-arch universal2 main.py
           chmod a+x ./dist/main
-          mv ./dist/main "./ESET-KeyGen_v${{ github.event.inputs.version }}_macos"
+          mv ./dist/main "./ESET-KeyGen_v${{ inputs.version }}_macos"
 
       - name: Upload macOS artifact
         uses: actions/upload-artifact@v4
         with:
           name: macos-artifact
-          path: ./ESET-KeyGen_v${{ github.event.inputs.version }}_macos
+          path: ./ESET-KeyGen_v${{ inputs.version }}_macos
 
   windows:
     runs-on: windows-latest
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
 
       - name: Download DLL patch
         run: |
@@ -61,47 +76,48 @@ jobs:
           .\python.exe -m pip install --upgrade pip --no-warn-script-location
           .\python.exe -m pip install pyinstaller -r ../requirements.txt --no-warn-script-location
           Scripts\pyinstaller.exe --onefile --collect-data selenium_stealth --add-data ..\dll_patch\api-ms-win-core-path-blender\x86\api-ms-win-core-path-l1-1-0.dll:. ../main.py
-          Move-Item -Path .\dist\main.exe -Destination "../ESET-KeyGen_v${{ github.event.inputs.version }}_win32.exe"
+          Move-Item -Path .\dist\main.exe -Destination "../ESET-KeyGen_v${{ inputs.version }}_win32.exe"
 
       - name: Compile win64
         run: |
           pip install --upgrade pip
           pip install pyinstaller -r requirements.txt
           pyinstaller --onefile --collect-data selenium_stealth --collect-all selenium --add-data dll_patch\api-ms-win-core-path-blender\x64\api-ms-win-core-path-l1-1-0.dll:. main.py
-          Move-Item -Path .\dist\main.exe -Destination "ESET-KeyGen_v${{ github.event.inputs.version }}_win64.exe"
+          Move-Item -Path .\dist\main.exe -Destination "ESET-KeyGen_v${{ inputs.version }}_win64.exe"
 
       - name: Upload Windows artifacts
         uses: actions/upload-artifact@v4
         with:
           name: windows-artifacts
           path: |
-            ESET-KeyGen_v${{ github.event.inputs.version }}_win32.exe
-            ESET-KeyGen_v${{ github.event.inputs.version }}_win64.exe
+            ESET-KeyGen_v${{ inputs.version }}_win32.exe
+            ESET-KeyGen_v${{ inputs.version }}_win64.exe
 
   release:
+    if: ${{ inputs.create_release == true }}
     needs: [macOS, windows]
     runs-on: ubuntu-latest
     steps:
       - name: Download macOS artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: macos-artifact
 
       - name: Download Windows artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: windows-artifacts
 
       - name: Create Release and Upload Assets
         uses: softprops/action-gh-release@v2
         with:
-          name: ${{ github.event.inputs.release_name }}
-          tag_name: v${{ github.event.inputs.tagname }}
+          name: ${{ inputs.release_name }}
+          tag_name: v${{ inputs.tagname }}
           draft: false
           generate_release_notes: true
           files: |
-            ESET-KeyGen_v${{ github.event.inputs.version }}_macos
-            ESET-KeyGen_v${{ github.event.inputs.version }}_win32.exe
-            ESET-KeyGen_v${{ github.event.inputs.version }}_win64.exe
+            ESET-KeyGen_v${{ inputs.version }}_macos
+            ESET-KeyGen_v${{ inputs.version }}_win32.exe
+            ESET-KeyGen_v${{ inputs.version }}_win64.exe
         env:
           GITHUB_TOKEN: ${{ secrets.PAT }}

.github/workflows/eset.yml

@@ -20,13 +20,7 @@ on:
         required: true
         type: choice
         options:
-          - 1secmail
-          - guerrillamail
-          - developermail
-          - mailticking
           - fakemail
-          - inboxes
-          - incognitomail
           - emailfake
         default: emailfake
       key_type:

.github/workflows/test.yml

@@ -11,15 +11,15 @@ on:
         required: true
         type: choice
         options:
-        - 1secmail
-        - guerrillamail
-        - developermail
-        - mailticking
         - fakemail
-        - inboxes
-        - incognitomail
         - emailfake
         default: fakemail
+      branch:
+        description: 'Branch of etkg repo to clone'
+        required: true
+        type: string
+        default: 'main'
+
 jobs:
   Test:
     runs-on: ubuntu-latest
@@ -35,62 +35,79 @@ jobs:
           KEY=1
           SMALL_BUSINESS_KEY=1
           VPN=0
+
           EMAIL_API="${{ github.event.inputs.mail }}"
           if [ -z "$EMAIL_API" ]; then
             EMAIL_API="fakemail"
           fi
+
+          TARGET_BRANCH="${{ github.event.inputs.branch }}"
+          if [ -z "$TARGET_BRANCH" ]; then
+            TARGET_BRANCH="main"
+          fi
+
           git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
-          git clone --depth 1 https://github.com/shadowcopyrz/etkg.git
+
+          git clone -b $TARGET_BRANCH --depth 1 https://github.com/shadowcopyrz/etkg.git
           cd etkg
+
           # Setup env
           sudo apt update
           sudo apt install -y python3-pip python3-venv
           python3 -m venv venv
           source venv/bin/activate
           pip install -r requirements.txt
+
           echo "Test results:" >> $GITHUB_STEP_SUMMARY
+
           if [[ ${ACCOUNT} != 0 ]]
           then
-          for ((attempt=1;attempt<=${ACCOUNT};++attempt))
-          do
-          python3 main.py --auto-detect-browser --account --email-api ${EMAIL_API} --skip-update-check --no-logo --disable-progress-bar --disable-logging
-          done
-          echo -e "\nAccounts generated:" >> $GITHUB_STEP_SUMMARY
-          cat ./*ACCOUNTS.txt >> $GITHUB_STEP_SUMMARY
+            for ((attempt=1;attempt<=${ACCOUNT};++attempt))
+            do
+              python3 main.py --auto-detect-browser --account --email-api ${EMAIL_API} --skip-update-check --no-logo --disable-progress-bar --disable-logging
+            done
+            echo -e "\nAccounts generated:" >> $GITHUB_STEP_SUMMARY
+            cat ./*ACCOUNTS.txt >> $GITHUB_STEP_SUMMARY
           fi
+
           if [[ ${KEY} != 0 ]]
           then
-          for ((attempt=1;attempt<=${KEY};++attempt))
-          do
-          python3 main.py --auto-detect-browser --key --email-api ${EMAIL_API} --skip-update-check --no-logo --disable-progress-bar --disable-logging
-          done
+            for ((attempt=1;attempt<=${KEY};++attempt))
+            do
+              python3 main.py --auto-detect-browser --key --email-api ${EMAIL_API} --skip-update-check --no-logo --disable-progress-bar --disable-logging
+            done
           fi
+
           if [[ ${SMALL_BUSINESS_KEY} != 0 ]]
           then
-          for ((attempt=1;attempt<=${SMALL_BUSINESS_KEY};++attempt))
-          do
-          python3 main.py --auto-detect-browser --small-business-key --email-api ${EMAIL_API} --skip-update-check --no-logo --disable-progress-bar --disable-logging
-          done
+            for ((attempt=1;attempt<=${SMALL_BUSINESS_KEY};++attempt))
+            do
+              python3 main.py --auto-detect-browser --small-business-key --email-api ${EMAIL_API} --skip-update-check --no-logo --disable-progress-bar --disable-logging
+            done
           fi
+
           if [[ ${VPN} != 0 ]]
           then
-          for ((attempt=1;attempt<=${VPN};++attempt))
-          do
-          python3 main.py --auto-detect-browser --vpn-codes --email-api ${EMAIL_API} --skip-update-check --no-logo --disable-progress-bar --disable-logging
-          done
+            for ((attempt=1;attempt<=${VPN};++attempt))
+            do
+              python3 main.py --auto-detect-browser --vpn-codes --email-api ${EMAIL_API} --skip-update-check --no-logo --disable-progress-bar --disable-logging
+            done
           fi
+
           if [[ ${KEY} != 0 || ${SMALL_BUSINESS_KEY} != 0 || ${VPN} != 0 ]]
           then
-          echo -e "\nKeys generated:" >> $GITHUB_STEP_SUMMARY
-          cat ./*KEYS.txt >> $GITHUB_STEP_SUMMARY
+            echo -e "\nKeys generated:" >> $GITHUB_STEP_SUMMARY
+            cat ./*KEYS.txt >> $GITHUB_STEP_SUMMARY
           fi
+
           echo 
           cd ${{ github.workspace }}
           sed -i 's/\(last_test-\)[0-9]\{2\}.[0-9]\{2\}.[0-9]\{4\}_[0-9]\{2\}:[0-9]\{2\}_UTC+3/\1'"$(date -u --date='3 hours' +"%d.%m.%Y_%H:%M_UTC+3")"'/' README.md
           sudo rm -r etkg
           git pull
           git commit -m "Update test time" -a
+
       - name: Push changes to the repo
         uses: ad-m/github-push-action@master
         with:

README.md

@@ -1,11 +1,11 @@
 <div align="center">
   <img src="https://github.com/shadowcopyrz/etkg/blob/main/img/logo_alt.png?raw=true" alt="logo"/>
 
-  ![Version](https://img.shields.io/badge/version-1.5.6.7-gold)
+  ![Version](https://img.shields.io/badge/version-1.5.7.0-gold)
 
   [![Commit activity](https://img.shields.io/github/commit-activity/t/shadowcopyrz/etkg/main?cacheSeconds=0)](https://github.com/shadowcopyrz/etkg/commits/main)
   ![Last commit](https://img.shields.io/github/last-commit/shadowcopyrz/etkg/main?cacheSeconds=0)
-  ![Last test](https://img.shields.io/badge/last_test-24.09.2026_06:27_UTC+3-blue)
+  ![Last test](https://img.shields.io/badge/last_test-24.09.2026_17:57_UTC+3-blue)
   [![Opened issues](https://img.shields.io/github/issues/shadowcopyrz/etkg?color=darkred)](https://github.com/shadowcopyrz/etkg/issues?cacheSeconds=0)
   [![Closed issues](https://img.shields.io/github/issues-closed/shadowcopyrz/etkg?color=darkgreen&cacheSeconds=0)](https://github.com/shadowcopyrz/etkg/issues?q=is%3Aissue+is%3Aclosed)
   ![License](https://img.shields.io/github/license/shadowcopyrz/etkg)