From 1a26899dbec6c98e86b632bfd0366617df096ac7 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 17:40:20 +0700
Subject: [PATCH 01/20] support more arch and upgrade python version for
 pyinstaller building

---
 .github/workflows/release.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 98423196c..4551a8f20 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,13 +13,13 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.11"]
-        platform: ["ubuntu-20.04", "macos-13", "windows-latest"]
-        architecture: ["x64"]
+        python-version: ["3.13"]
+        platform: ["ubuntu-latest", "macos-latest", "windows-latest"]
         include:
-          - architecture: "x86"
-            platform: "windows-latest"
-            python-version: "3.11"
+          - platform: "windows-latest"
+            architecture: "x86"
+          - platform: "macos-13"
+          - platform: "ubuntu-20.04"
 
     runs-on: ${{ matrix.platform }}
 

From 51474eff92cc32720932426fcdc1a46cd896a50b Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 17:46:33 +0700
Subject: [PATCH 02/20] Error: AssertionError [ERR_ASSERTION]: Unsupported
 architecture (only x64 is supported)

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4551a8f20..274a7ad6d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -53,7 +53,7 @@ jobs:
         uses: FedericoCarboni/setup-ffmpeg@v3
         # ffmpeg is not supported in the latest macOS arch:
         # Error: setup-ffmpeg can only be run on 64-bit systems
-        if: matrix.platform != 'macos-13'
+        if: matrix.architecture == 'x64'
 
       - name: Set up ${{ matrix.architecture }} Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5

From c36f3d8987201563fe17109467b10df58c157a69 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 17:49:14 +0700
Subject: [PATCH 03/20] bump version

---
 mapillary_tools/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mapillary_tools/__init__.py b/mapillary_tools/__init__.py
index 364338ecf..971e8a506 100644
--- a/mapillary_tools/__init__.py
+++ b/mapillary_tools/__init__.py
@@ -1 +1 @@
-VERSION = "0.13.0"
+VERSION = "0.13.1a1"

From 49e68291745d42dbfda56871bdbbd0b5064159f8 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 18:14:55 +0700
Subject: [PATCH 04/20] fix

---
 .github/workflows/release.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 274a7ad6d..7fcfc80b6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,9 @@ jobs:
           - platform: "windows-latest"
             architecture: "x86"
           - platform: "macos-13"
+            architecture: "x64"
           - platform: "ubuntu-20.04"
+            architecture: "x64"
 
     runs-on: ${{ matrix.platform }}
 
@@ -55,12 +57,10 @@ jobs:
         # Error: setup-ffmpeg can only be run on 64-bit systems
         if: matrix.architecture == 'x64'
 
-      - name: Set up ${{ matrix.architecture }} Python ${{ matrix.python-version }}
+      - name: Set up ${{ runner.architecture }} Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          # optional x64 or x86. Defaults to x64 if not specified
-          architecture: ${{ matrix.architecture }}
 
       - name: Install dependencies
         run: |
@@ -79,7 +79,7 @@ jobs:
 
       - name: Build and test with Pyinstaller on MacOS
         # Enable for Python3.11 only because it often fails at codesign (subprocess timeout)
-        if: matrix.platform == 'macos-13'
+        if: startsWith(matrix.platform, 'macos')
         run: |
           ./script/build_osx
           # Could run full integration tests with the binary (it might be slow)
@@ -89,7 +89,7 @@ jobs:
           MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
 
       - name: Build and test with Pyinstaller on Ubuntu
-        if: matrix.platform == 'ubuntu-20.04'
+        if: startsWith(matrix.platform, 'ubuntu-latest')
         run: |
           ./script/build_linux
           # Could run full integration tests with the binary (it might be slow)
@@ -99,7 +99,7 @@ jobs:
           MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
 
       - name: Build and test with Pyinstaller on Windows
-        if: matrix.platform == 'windows-latest'
+        if: startsWith(matrix.platform, 'windows')
         run: |
           ./script/build_bootloader.ps1
           ./script/build_win.ps1

From 6efc19e4a6a8204344e4b3d6e51a93113913e19b Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 18:17:27 +0700
Subject: [PATCH 05/20] fix

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7fcfc80b6..e06a8d818 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -89,7 +89,7 @@ jobs:
           MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
 
       - name: Build and test with Pyinstaller on Ubuntu
-        if: startsWith(matrix.platform, 'ubuntu-latest')
+        if: startsWith(matrix.platform, 'ubuntu')
         run: |
           ./script/build_linux
           # Could run full integration tests with the binary (it might be slow)
@@ -123,7 +123,7 @@ jobs:
     if: ${{ startsWith(github.ref, 'refs/tags/') }}
     name: Upload release to PyPI
     needs: ["build_and_release"]
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v4
 

From 0e58fdc8528c06175aa1df13f5e45b7aca63324c Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 18:32:49 +0700
Subject: [PATCH 06/20] fix

---
 .github/workflows/release.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e06a8d818..d364148a8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,15 +13,9 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.13"]
+        python-version: ["3.12"]
         platform: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        include:
-          - platform: "windows-latest"
-            architecture: "x86"
-          - platform: "macos-13"
-            architecture: "x64"
-          - platform: "ubuntu-20.04"
-            architecture: "x64"
+        architecture: ["x86", "x64", "arm64"]
 
     runs-on: ${{ matrix.platform }}
 

From 2112cfeb617ce690f3b2a382864a9e8cb99887c0 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 18:41:52 +0700
Subject: [PATCH 07/20] fix

---
 .github/workflows/release.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d364148a8..332239e14 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,12 @@ jobs:
         python-version: ["3.12"]
         platform: ["ubuntu-latest", "macos-latest", "windows-latest"]
         architecture: ["x86", "x64", "arm64"]
+        exclude:
+          - platform: "macos-latest"
+            architecture: ["x86", "x64"]
+        include:
+          - platform: "macos-13"
+            architecture: "x64"
 
     runs-on: ${{ matrix.platform }}
 
@@ -51,7 +57,7 @@ jobs:
         # Error: setup-ffmpeg can only be run on 64-bit systems
         if: matrix.architecture == 'x64'
 
-      - name: Set up ${{ runner.architecture }} Python ${{ matrix.python-version }}
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}

From a18fe50c1e8493473e7d062b497408f74b90f1e7 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 18:45:28 +0700
Subject: [PATCH 08/20] fix

---
 .github/workflows/release.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 332239e14..720559935 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,14 +14,15 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.12"]
-        platform: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        architecture: ["x86", "x64", "arm64"]
-        exclude:
-          - platform: "macos-latest"
-            architecture: ["x86", "x64"]
         include:
+          - platform: "macos-latest"
+            architecture: "arm64"
           - platform: "macos-13"
             architecture: "x64"
+          - platform: "windows-latest"
+            architecture: ["x86", "x64", "arm64"]
+          - platform: "ubuntu-latest"
+            architecture: ["x86", "x64", "arm64"]
 
     runs-on: ${{ matrix.platform }}
 

From f3c54bbea3c24204b110d26417a21d48b3a384ad Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 19:22:11 +0700
Subject: [PATCH 09/20] fix

---
 .github/workflows/release.yml | 88 ++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 720559935..35db986b1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,19 +12,48 @@ jobs:
     if: ${{ startsWith(github.ref, 'refs/tags/') }}
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.12"]
         include:
-          - platform: "macos-latest"
-            architecture: "arm64"
-          - platform: "macos-13"
-            architecture: "x64"
-          - platform: "windows-latest"
-            architecture: ["x86", "x64", "arm64"]
-          - platform: "ubuntu-latest"
-            architecture: ["x86", "x64", "arm64"]
-
-    runs-on: ${{ matrix.platform }}
+          # macOS
+          - platform: mac-arm64
+            runs-on: macos-latest
+            os: macos
+            arch: arm64 # Apple Silicon
+          - platform: mac-intel
+            runs-on: macos-13
+            os: macos
+            arch: x64
+            supports_ffmpeg: true # Intel Mac
+
+          # Windows
+          - platform: win-x64
+            runs-on: windows-latest
+            os: windows
+            arch: x64
+            supports_ffmpeg: true
+          - platform: win-x86
+            runs-on: windows-latest
+            os: windows
+            arch: x86
+          - platform: win-arm64
+            runs-on: windows-latest
+            os: windows
+            arch: arm64
+
+          # Linux
+          - platform: linux-x64
+            runs-on: ubuntu-latest
+            os: linux
+            arch: x64
+            supports_ffmpeg: true
+          - platform: linux-arm64
+            runs-on: ubuntu-latest
+            os: linux
+            arch: arm64
+
+    runs-on: ${{ matrix.runs-on }}
 
     defaults:
       run:
@@ -54,14 +83,13 @@ jobs:
 
       - name: Setup FFmpeg
         uses: FedericoCarboni/setup-ffmpeg@v3
-        # ffmpeg is not supported in the latest macOS arch:
-        # Error: setup-ffmpeg can only be run on 64-bit systems
-        if: matrix.architecture == 'x64'
+        if: ${{ matrix.supports_ffmpeg }}
 
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.arch }}
 
       - name: Install dependencies
         run: |
@@ -78,37 +106,13 @@ jobs:
           fi
         if: matrix.platform != 'windows-latest'
 
-      - name: Build and test with Pyinstaller on MacOS
-        # Enable for Python3.11 only because it often fails at codesign (subprocess timeout)
-        if: startsWith(matrix.platform, 'macos')
-        run: |
-          ./script/build_osx
-          # Could run full integration tests with the binary (it might be slow)
-          pytest tests/integration
-        env:
-          MAPILLARY_TOOLS__TESTS_EXECUTABLE: ./dist/osx/mapillary_tools
-          MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
-
-      - name: Build and test with Pyinstaller on Ubuntu
-        if: startsWith(matrix.platform, 'ubuntu')
-        run: |
-          ./script/build_linux
-          # Could run full integration tests with the binary (it might be slow)
-          pytest tests/integration
-        env:
-          MAPILLARY_TOOLS__TESTS_EXECUTABLE: ./dist/linux/mapillary_tools
-          MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
-
-      - name: Build and test with Pyinstaller on Windows
-        if: startsWith(matrix.platform, 'windows')
+      - name: Build and test
         run: |
-          ./script/build_bootloader.ps1
-          ./script/build_win.ps1
-          # Could run full integration tests with the binary (it might be slow)
-          cp ./dist/win/mapillary_tools.exe mapillary_tools_WINDOWS_VERY_HARD_TO_FIND_YOU_IN_ANOTHER_DIR_SO_I_MOVE_YOU_HERE.exe
+          ./script/build_${{ matrix.os }}
           pytest tests/integration
         env:
-          MAPILLARY_TOOLS__TESTS_EXECUTABLE: mapillary_tools_WINDOWS_VERY_HARD_TO_FIND_YOU_IN_ANOTHER_DIR_SO_I_MOVE_YOU_HERE.exe
+          ARCH: ${{ matrix.arch }}
+          MAPILLARY_TOOLS__TESTS_EXECUTABLE: ./dist/${{ matrix.os }}/mapillary_tools${{ matrix.os == 'windows' && '.exe' || '' }}
           MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
 
       - name: Release

From 42b04f68627c52da9d83a692e3a5cb93cec8fa3b Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 19:24:11 +0700
Subject: [PATCH 10/20] Revert "fix"

This reverts commit f3c54bbea3c24204b110d26417a21d48b3a384ad.
---
 .github/workflows/release.yml | 88 +++++++++++++++++------------------
 1 file changed, 42 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 35db986b1..720559935 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,48 +12,19 @@ jobs:
     if: ${{ startsWith(github.ref, 'refs/tags/') }}
 
     strategy:
-      fail-fast: false
       matrix:
         python-version: ["3.12"]
         include:
-          # macOS
-          - platform: mac-arm64
-            runs-on: macos-latest
-            os: macos
-            arch: arm64 # Apple Silicon
-          - platform: mac-intel
-            runs-on: macos-13
-            os: macos
-            arch: x64
-            supports_ffmpeg: true # Intel Mac
-
-          # Windows
-          - platform: win-x64
-            runs-on: windows-latest
-            os: windows
-            arch: x64
-            supports_ffmpeg: true
-          - platform: win-x86
-            runs-on: windows-latest
-            os: windows
-            arch: x86
-          - platform: win-arm64
-            runs-on: windows-latest
-            os: windows
-            arch: arm64
-
-          # Linux
-          - platform: linux-x64
-            runs-on: ubuntu-latest
-            os: linux
-            arch: x64
-            supports_ffmpeg: true
-          - platform: linux-arm64
-            runs-on: ubuntu-latest
-            os: linux
-            arch: arm64
-
-    runs-on: ${{ matrix.runs-on }}
+          - platform: "macos-latest"
+            architecture: "arm64"
+          - platform: "macos-13"
+            architecture: "x64"
+          - platform: "windows-latest"
+            architecture: ["x86", "x64", "arm64"]
+          - platform: "ubuntu-latest"
+            architecture: ["x86", "x64", "arm64"]
+
+    runs-on: ${{ matrix.platform }}
 
     defaults:
       run:
@@ -83,13 +54,14 @@ jobs:
 
       - name: Setup FFmpeg
         uses: FedericoCarboni/setup-ffmpeg@v3
-        if: ${{ matrix.supports_ffmpeg }}
+        # ffmpeg is not supported in the latest macOS arch:
+        # Error: setup-ffmpeg can only be run on 64-bit systems
+        if: matrix.architecture == 'x64'
 
-      - name: Set up Python
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          architecture: ${{ matrix.arch }}
 
       - name: Install dependencies
         run: |
@@ -106,13 +78,37 @@ jobs:
           fi
         if: matrix.platform != 'windows-latest'
 
-      - name: Build and test
+      - name: Build and test with Pyinstaller on MacOS
+        # Enable for Python3.11 only because it often fails at codesign (subprocess timeout)
+        if: startsWith(matrix.platform, 'macos')
+        run: |
+          ./script/build_osx
+          # Could run full integration tests with the binary (it might be slow)
+          pytest tests/integration
+        env:
+          MAPILLARY_TOOLS__TESTS_EXECUTABLE: ./dist/osx/mapillary_tools
+          MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
+
+      - name: Build and test with Pyinstaller on Ubuntu
+        if: startsWith(matrix.platform, 'ubuntu')
+        run: |
+          ./script/build_linux
+          # Could run full integration tests with the binary (it might be slow)
+          pytest tests/integration
+        env:
+          MAPILLARY_TOOLS__TESTS_EXECUTABLE: ./dist/linux/mapillary_tools
+          MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
+
+      - name: Build and test with Pyinstaller on Windows
+        if: startsWith(matrix.platform, 'windows')
         run: |
-          ./script/build_${{ matrix.os }}
+          ./script/build_bootloader.ps1
+          ./script/build_win.ps1
+          # Could run full integration tests with the binary (it might be slow)
+          cp ./dist/win/mapillary_tools.exe mapillary_tools_WINDOWS_VERY_HARD_TO_FIND_YOU_IN_ANOTHER_DIR_SO_I_MOVE_YOU_HERE.exe
           pytest tests/integration
         env:
-          ARCH: ${{ matrix.arch }}
-          MAPILLARY_TOOLS__TESTS_EXECUTABLE: ./dist/${{ matrix.os }}/mapillary_tools${{ matrix.os == 'windows' && '.exe' || '' }}
+          MAPILLARY_TOOLS__TESTS_EXECUTABLE: mapillary_tools_WINDOWS_VERY_HARD_TO_FIND_YOU_IN_ANOTHER_DIR_SO_I_MOVE_YOU_HERE.exe
           MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
 
       - name: Release

From 03cddeb981c2efe99acadd6e54b67114241468ff Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 19:29:02 +0700
Subject: [PATCH 11/20] fix

---
 .github/workflows/release.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 720559935..f85c9d544 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,15 +14,14 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.12"]
+        platform: ["macos-latest", "ubuntu-latest", "windows-latest"]
         include:
-          - platform: "macos-latest"
-            architecture: "arm64"
           - platform: "macos-13"
             architecture: "x64"
           - platform: "windows-latest"
-            architecture: ["x86", "x64", "arm64"]
+            architecture: ["x86", "arm64"]
           - platform: "ubuntu-latest"
-            architecture: ["x86", "x64", "arm64"]
+            architecture: ["x86", "arm64"]
 
     runs-on: ${{ matrix.platform }}
 

From 8402defaec324f255687d957b227ffc3e693e29b Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 19:31:49 +0700
Subject: [PATCH 12/20] fix

---
 .github/workflows/release.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f85c9d544..b9efa667f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,9 +19,13 @@ jobs:
           - platform: "macos-13"
             architecture: "x64"
           - platform: "windows-latest"
-            architecture: ["x86", "arm64"]
+            architecture: "x86"
+          - platform: "windows-latest"
+            architecture: "arm64"
+          - platform: "ubuntu-latest"
+            architecture: "x86"
           - platform: "ubuntu-latest"
-            architecture: ["x86", "arm64"]
+            architecture: "arm64"
 
     runs-on: ${{ matrix.platform }}
 

From 142ceda278d925ac7566418b02299b44f5614d55 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 19:44:19 +0700
Subject: [PATCH 13/20] fix

---
 .github/workflows/release.yml | 46 +++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b9efa667f..3edf57889 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,19 +13,39 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.12"]
-        platform: ["macos-latest", "ubuntu-latest", "windows-latest"]
         include:
-          - platform: "macos-13"
-            architecture: "x64"
-          - platform: "windows-latest"
-            architecture: "x86"
-          - platform: "windows-latest"
-            architecture: "arm64"
-          - platform: "ubuntu-latest"
-            architecture: "x86"
-          - platform: "ubuntu-latest"
-            architecture: "arm64"
+          # macOS builds
+          - platform: macos-latest # M1/M2
+            os: macos
+            arch: arm64
+          - platform: macos-13 # Intel
+            os: macos
+            arch: x64
+            supports_ffmpeg: true
+
+          # Windows builds
+          - platform: windows-latest
+            os: windows
+            arch: x64
+            supports_ffmpeg: true
+          - platform: windows-latest
+            os: windows
+            arch: x86 # 32-bit
+          - platform: windows-latest
+            os: windows
+            arch: arm64 # Windows ARM
+
+          # Linux builds
+          - platform: ubuntu-latest
+            os: linux
+            arch: x64
+            supports_ffmpeg: true
+          - platform: ubuntu-latest
+            os: linux
+            arch: arm64 # Linux ARM
+          - platform: ubuntu-latest
+            os: linux
+            arch: x86 # 32-bit Linux
 
     runs-on: ${{ matrix.platform }}
 
@@ -64,7 +84,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.11"
 
       - name: Install dependencies
         run: |

From 6baa46c9e09c2a79ac099df1e151a17aeccfeafe Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 20:04:19 +0700
Subject: [PATCH 14/20] fix

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3edf57889..94114f90f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
             os: linux
             arch: x64
             supports_ffmpeg: true
-          - platform: ubuntu-latest
+          - platform: 2-core-ubuntu-arm
             os: linux
             arch: arm64 # Linux ARM
           - platform: ubuntu-latest

From f8da5c416b175678d6f6a30fc2bb4e7a7e3e04da Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 22:34:21 +0700
Subject: [PATCH 15/20] fix

---
 .github/workflows/release.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 94114f90f..9e25a6c78 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,39 +13,40 @@ jobs:
 
     strategy:
       matrix:
+        python-version: ["3.11"]
         include:
           # macOS builds
           - platform: macos-latest # M1/M2
             os: macos
-            arch: arm64
+            architecture: arm64
           - platform: macos-13 # Intel
             os: macos
-            arch: x64
+            architecture: x64
             supports_ffmpeg: true
 
           # Windows builds
           - platform: windows-latest
             os: windows
-            arch: x64
+            architecture: x64
             supports_ffmpeg: true
           - platform: windows-latest
             os: windows
-            arch: x86 # 32-bit
+            architecture: x86 # 32-bit
           - platform: windows-latest
             os: windows
-            arch: arm64 # Windows ARM
+            architecture: arm64 # Windows ARM
 
           # Linux builds
           - platform: ubuntu-latest
             os: linux
-            arch: x64
+            architecture: x64
             supports_ffmpeg: true
           - platform: 2-core-ubuntu-arm
             os: linux
-            arch: arm64 # Linux ARM
+            architecture: arm64 # Linux ARM
           - platform: ubuntu-latest
             os: linux
-            arch: x86 # 32-bit Linux
+            architecture: x86 # 32-bit Linux
 
     runs-on: ${{ matrix.platform }}
 
@@ -84,7 +85,8 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.architecture }}
 
       - name: Install dependencies
         run: |

From 8133b67ba7025b41513c7f8a04633211df475d92 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 22:39:10 +0700
Subject: [PATCH 16/20] fix

---
 .github/workflows/release.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9e25a6c78..3044653b9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,9 +44,6 @@ jobs:
           - platform: 2-core-ubuntu-arm
             os: linux
             architecture: arm64 # Linux ARM
-          - platform: ubuntu-latest
-            os: linux
-            architecture: x86 # 32-bit Linux
 
     runs-on: ${{ matrix.platform }}
 

From e870f1258bfe6f5491b3c2d4ea564646aad702b4 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 22:41:14 +0700
Subject: [PATCH 17/20] fix

---
 .github/workflows/release.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3044653b9..b31b17b50 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,6 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.11"]
         include:
           # macOS builds
           - platform: macos-latest # M1/M2
@@ -79,10 +78,10 @@ jobs:
         # Error: setup-ffmpeg can only be run on 64-bit systems
         if: matrix.architecture == 'x64'
 
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.11"
           architecture: ${{ matrix.architecture }}
 
       - name: Install dependencies
@@ -112,7 +111,7 @@ jobs:
           MAPILLARY_TOOLS__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
 
       - name: Build and test with Pyinstaller on Ubuntu
-        if: startsWith(matrix.platform, 'ubuntu')
+        if: contains(matrix.platform, 'ubuntu')
         run: |
           ./script/build_linux
           # Could run full integration tests with the binary (it might be slow)

From b35322a3f439f3d993d78af57232b2ba11371dbf Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 22:54:47 +0700
Subject: [PATCH 18/20] fix

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b31b17b50..752e3d74e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
           - platform: windows-latest
             os: windows
             architecture: x86 # 32-bit
-          - platform: windows-latest
+          - platform: windows-2025
             os: windows
             architecture: arm64 # Windows ARM
 
@@ -40,7 +40,7 @@ jobs:
             os: linux
             architecture: x64
             supports_ffmpeg: true
-          - platform: 2-core-ubuntu-arm
+          - platform: ubuntu-latest-arm
             os: linux
             architecture: arm64 # Linux ARM
 

From 4dffa2964d65c49161db6f16f9420de13b5de1fc Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 22:57:17 +0700
Subject: [PATCH 19/20] fix

---
 .github/workflows/release.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 752e3d74e..e817ca705 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,25 +21,23 @@ jobs:
           - platform: macos-13 # Intel
             os: macos
             architecture: x64
-            supports_ffmpeg: true
 
           # Windows builds
           - platform: windows-latest
             os: windows
             architecture: x64
-            supports_ffmpeg: true
           - platform: windows-latest
             os: windows
             architecture: x86 # 32-bit
-          - platform: windows-2025
-            os: windows
-            architecture: arm64 # Windows ARM
+          # NOT SUPPORTED YET
+          # - platform: windows-2025
+          #   os: windows
+          #   architecture: arm64 # Windows ARM
 
           # Linux builds
           - platform: ubuntu-latest
             os: linux
             architecture: x64
-            supports_ffmpeg: true
           - platform: ubuntu-latest-arm
             os: linux
             architecture: arm64 # Linux ARM

From 5c06be111cd8daaa36d88c33f9b543f41d463d95 Mon Sep 17 00:00:00 2001
From: Tao Peng <ptpttt@gmail.com>
Date: Thu, 20 Feb 2025 23:21:18 +0700
Subject: [PATCH 20/20] switch back to 2-core-ubuntu-arm

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e817ca705..4ae31ec8e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,7 +38,8 @@ jobs:
           - platform: ubuntu-latest
             os: linux
             architecture: x64
-          - platform: ubuntu-latest-arm
+          - platform: 2-core-ubuntu-arm # or ubuntu-latest-arm
+            # Check other options in https://github.com/mapillary/mapillary_tools/actions/runners
             os: linux
             architecture: arm64 # Linux ARM