fix VERSION_PATCH for pre-tags, e.g. 1b1

.github/workflows/ci_docker.yml

@@ -24,7 +24,7 @@ on:
 
 jobs:
   build-and-push-docker-debian-image:
-    name: Build Docker image and push to repositories
+    name: Build Docker Bullseye image and push to repositories
     # run only when code is compiling and tests are passing
     runs-on: ubuntu-latest
 
@@ -63,7 +63,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_IO_TOKEN }}
 
-      - name: "qr_reader: Build image and push to Docker Hub and GitHub Container Registry"
+      - name: "Build image and push to Docker Hub and GitHub Container Registry"
         id: docker_build_qr_reader_latest
         uses: docker/build-push-action@v3
         with:
@@ -89,7 +89,7 @@ jobs:
           echo "extract_otp_secrets: ${{ steps.docker_build_qr_reader_latest.outputs.digest }}"
 
   build-and-push-docker-alpine-image:
-    name: Build Docker image and push to repositories
+    name: Build Docker Alpine image and push to repositories
     # run only when code is compiling and tests are passing
     runs-on: ubuntu-latest
 

.github/workflows/ci_release.yml

@@ -184,14 +184,17 @@ jobs:
       matrix:
         # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners
         include:
-          - os: ubuntu-latest
-            TARGET: linux
+          - os: windows-latest
+            TARGET: windows
+            # TODO add --icon
+            # TODO add --manifest
+            # TODO find more elegant solution for pyzbar\libiconv.dll and pyzbar\libzbar-64.dll
             CMD_BUILD: |
-                pyinstaller -y --add-data $pythonLocation/__yolo_v3_qr_detector/:__yolo_v3_qr_detector/ --onefile src/extract_otp_secrets.py
-            OUT_FILE_NAME: extract_otp_secrets
-            ASSET_NAME: extract_otp_secrets_linux_x86_64_ubuntu_latest
-            ASSET_MIME: application/x-executable
-            UPLOAD: false
+              pyinstaller -y --add-data "$($Env:pythonLocation)\__yolo_v3_qr_detector;__yolo_v3_qr_detector" --add-binary "$($Env:pythonLocation)\Lib\site-packages\pyzbar\libiconv.dll;pyzbar" --add-binary "$($Env:pythonLocation)\Lib\site-packages\pyzbar\libzbar-64.dll;pyzbar" --onefile --version-file build\file_version_info.txt src\extract_otp_secrets.py
+            OUT_FILE_NAME: extract_otp_secrets.exe
+            ASSET_NAME: extract_otp_secrets_win_x86_64.exe
+            ASSET_MIME: application/vnd.microsoft.portable-executable
+            UPLOAD: true
           - os: macos-11
             TARGET: macos
             # TODO add --icon
@@ -206,17 +209,14 @@ jobs:
             ASSET_NAME: extract_otp_secrets_macos_x86_64
             ASSET_MIME: application/x-newton-compatible-pkg
             UPLOAD: true
-          - os: windows-latest
-            TARGET: windows
-            # TODO add --icon
-            # TODO add --manifest
-            # TODO find more elegant solution for pyzbar\libiconv.dll and pyzbar\libzbar-64.dll
+          - os: ubuntu-latest
+            TARGET: linux
             CMD_BUILD: |
-              pyinstaller -y --add-data "$($Env:pythonLocation)\__yolo_v3_qr_detector;__yolo_v3_qr_detector" --add-binary "$($Env:pythonLocation)\Lib\site-packages\pyzbar\libiconv.dll;pyzbar" --add-binary "$($Env:pythonLocation)\Lib\site-packages\pyzbar\libzbar-64.dll;pyzbar" --onefile --version-file build\file_version_info.txt src\extract_otp_secrets.py
-            OUT_FILE_NAME: extract_otp_secrets.exe
-            ASSET_NAME: extract_otp_secrets_win_x86_64.exe
-            ASSET_MIME: application/vnd.microsoft.portable-executable
-            UPLOAD: true
+                pyinstaller -y --add-data $pythonLocation/__yolo_v3_qr_detector/:__yolo_v3_qr_detector/ --onefile src/extract_otp_secrets.py
+            OUT_FILE_NAME: extract_otp_secrets
+            ASSET_NAME: extract_otp_secrets_linux_x86_64_ubuntu_latest
+            ASSET_MIME: application/x-executable
+            UPLOAD: false
     steps:
       - uses: actions/checkout@v3
       - name: Set macos macos_python_path
@@ -245,7 +245,7 @@ jobs:
         shell: bash
         run: |
               mkdir -p build/
-              VERSION_STR=$(setuptools-git-versioning) VERSION_MAJOR=$(cut -d '.' -f 1 <<< "$(setuptools-git-versioning)") VERSION_MINOR=$(cut -d '.' -f 2 <<< "$(setuptools-git-versioning)") VERSION_PATCH=$(cut -d '.' -f 3 <<< "$(setuptools-git-versioning)") VERSION_BUILD=$(($(git rev-list --count $(git tag | sort -V -r | sed '1!d')..HEAD))) YEARS='2020-2023' envsubst < file_version_info_template.txt > build/file_version_info.txt
+              VERSION_STR=$(setuptools-git-versioning) VERSION_MAJOR=$(cut -d '.' -f 1 <<< "$(setuptools-git-versioning)") VERSION_MINOR=$(cut -d '.' -f 2 <<< "$(setuptools-git-versioning)") VERSION_PATCH=$(echo $(cut -d '.' -f 3 <<< "$(setuptools-git-versioning)") | sed -E "s/^([0-9]+).*/\1/") VERSION_BUILD=$(($(git rev-list --count $(git tag | sort -V -r | sed '1!d')..HEAD))) YEARS='2020-2023' envsubst < file_version_info_template.txt > build/file_version_info.txt
       - name: Build with pyinstaller for ${{ matrix.TARGET }}
         run: ${{ matrix.CMD_BUILD }}
       - name: Smoke tests for generated exe (general)

README.md

@@ -144,8 +144,8 @@ python src/extract_otp_secrets.py example_export.txt
 1. Download executable for your platform from [latest release](https://github.com/scito/extract_otp_secrets/releases/latest), see assets
 2. Start executable by clicking or from command line
 
-✅ Everything is just packed in one executable.
-✅ No installation needed, neither Python nor dependencies have to be installed.
+✅ Everything is just packed in one executable.  
+✅ No installation needed, neither Python nor dependencies have to be installed.  
 ✅ Easy and convenient
 
 ### Run as script (recommend for developers or advanced users)