Update build actions

Author: jim-easterbrook

.github/workflows/build-exiv2-wheels-prebuilt.yml

@@ -3,29 +3,33 @@ on: workflow_dispatch
 
 jobs:
   build:
-    name: build on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: build ${{ matrix.build }}
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        os:
-          - ubuntu-22.04
-          - ubuntu-22.04-arm
-          - macos-13
-          - macos-14
-          - windows-2022
         include:
-          - os: ubuntu-22.04
-            arch: Linux-x86_64
-          - os: ubuntu-22.04-arm
-            arch: Linux-aarch64
-          - os: macos-13
-            arch: Darwin-x86_64
-            target: 13.7
-          - os: macos-14
-            arch: Darwin-arm64
+          - build: Linux-x64
+            runner: ubuntu-22.04
+            exiv2_build: Linux-x86_64
+            arch: x86_64
+          - build: Linux-arm64
+            runner: ubuntu-22.04-arm
+            exiv2_build: Linux-aarch64
+            arch: aarch64
+          - build: MacOS-x64
+            runner: macos-15-intel
+            exiv2_build: Darwin-x86_64
+            target: 15.0
+            arch: x86_64
+          - build: MacOS-arm64
+            runner: macos-14
+            exiv2_build: Darwin-arm64
             target: 14.0
-          - os: windows-2022
-            arch: 2022msvc-AMD64
+            arch: arm64
+          - build: Windows-x64
+            runner: windows-2022
+            exiv2_build: 2022msvc-AMD64
+            arch: AMD64
     defaults:
       run:
         shell: bash
@@ -38,22 +42,22 @@ jobs:
       - name: Download exiv2.tar.gz
         if: ${{ runner.os != 'Windows' }}
         run: |
-          wget -nv https://github.com/Exiv2/exiv2/releases/download/v${{ env.EXIV2_VSN }}/exiv2-${{ env.EXIV2_VSN }}-${{ matrix.arch }}.tar.gz -O - |
+          wget -nv https://github.com/Exiv2/exiv2/releases/download/v${{ env.EXIV2_VSN }}/exiv2-${{ env.EXIV2_VSN }}-${{ matrix.exiv2_build }}.tar.gz -O - |
           tar zxf -
 
       - name: Download exiv2.zip
         if: ${{ runner.os == 'Windows' }}
         run: |
-          c:/msys64/usr/bin/wget.exe -nv https://github.com/Exiv2/exiv2/releases/download/v${{ env.EXIV2_VSN }}/exiv2-${{ env.EXIV2_VSN }}-${{ matrix.arch }}.zip -O exiv2.zip
+          c:/msys64/usr/bin/wget.exe -nv https://github.com/Exiv2/exiv2/releases/download/v${{ env.EXIV2_VSN }}/exiv2-${{ env.EXIV2_VSN }}-${{ matrix.exiv2_build }}.zip -O exiv2.zip
           unzip exiv2.zip
 
       - name: Build wheels
         # cibuildwheel@v3.x omits Python 3.6 & 3.7
         uses: pypa/cibuildwheel@v3.1.4
         env:
-          CIBW_ARCHS: auto64
+          CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_ENVIRONMENT: >
-            EXIV2_ROOT=exiv2-${{ env.EXIV2_VSN }}-${{ matrix.arch }}
+            EXIV2_ROOT=exiv2-${{ env.EXIV2_VSN }}-${{ matrix.exiv2_build }}
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_34
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_34
           CIBW_BUILD: "cp*"
@@ -67,5 +71,5 @@ jobs:
       - name: Store results
         uses: actions/upload-artifact@v4
         with:
-          name: exiv2-wheels-${{ runner.os }}-${{ runner.arch }}
+          name: exiv2-wheels-${{ matrix.build }}
           path: wheelhouse/*.whl

.github/workflows/build-exiv2-wheels.yml

@@ -3,25 +3,32 @@ on: workflow_dispatch
 
 jobs:
   build:
-    name: build on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: build ${{ matrix.build }}
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        os:
-          - ubuntu-22.04
-          - ubuntu-22.04-arm
-          - macos-13
-          - macos-14
-          - windows-2022
         include:
-          - wget: wget
-          - os: macos-13
+          - build: Linux-x64
+            runner: ubuntu-22.04
             arch: x86_64
-            target: 13.0
-          - os: macos-14
-            arch: arm64
+            wget: wget
+          - build: Linux-arm64
+            runner: ubuntu-22.04-arm
+            arch: aarch64
+            wget: wget
+          - build: MacOS-x64
+            runner: macos-15-intel
+            target: 14.0
+            arch: x86_64
+            wget: wget
+          - build: MacOS-arm64
+            runner: macos-14
             target: 14.0
-          - os: windows-2022
+            arch: arm64
+            wget: wget
+          - build: Windows-x64
+            runner: windows-2022
+            arch: AMD64
             wget: c:/msys64/usr/bin/wget.exe
     env:
       EXIV2_SRC: >
@@ -70,7 +77,7 @@ jobs:
       - name: Build exiv2 (Windows)
         if: ${{ runner.os == 'Windows' }}
         run: >
-          pip install conan==1.59.0 &&
+          pip install conan==1.66.0 &&
           cd libexiv2 &&
           echo -e "24a25\n>         self.requires('libgettext/0.21')" |
           patch conanfile.py &&
@@ -91,11 +98,11 @@ jobs:
           cmake --install build-base_mac --config Release
 
       - name: Build wheels (Python 3.6 & 3.7)
-        if: ${{ matrix.os != 'macos-14' }}
+        if: ${{ runner.os != 'macOS' }}
         # cibuildwheel@v3.x omits Python 3.6 & 3.7
         uses: pypa/cibuildwheel@v2.23.3
         env:
-          CIBW_ARCHS: auto64
+          CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
           CIBW_ENVIRONMENT_LINUX: >
@@ -128,7 +135,7 @@ jobs:
       - name: Build wheels (Python 3.8+)
         uses: pypa/cibuildwheel@v3.2.1
         env:
-          CIBW_ARCHS: auto64
+          CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
           CIBW_ENVIRONMENT_LINUX: >
@@ -160,5 +167,5 @@ jobs:
       - name: Store results
         uses: actions/upload-artifact@v4
         with:
-          name: exiv2-wheels-${{ runner.os }}-${{ runner.arch }}
+          name: exiv2-wheels-${{ matrix.build }}
           path: wheelhouse/*.whl