diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8655f84..70bcd42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: # 3.x is used to run code coverage python-version: ["3.x", "3.14", "3.13", "3.12", "3.11", "3.10", "3.9"] - platform: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm, macos-13] + platform: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm, macos-15-intel] exclude: - python-version: "3.14" platform: windows-latest diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 1937273..e95c05f 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -226,6 +226,7 @@ jobs: needs: create-release runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners include: @@ -257,7 +258,7 @@ jobs: UPLOAD: false CMD_BUILD: | pyinstaller -y --add-data $pythonLocation/__yolo_v3_qr_detector/:__yolo_v3_qr_detector/ --onefile --name extract_otp_secrets_ubuntu_arm64 src/extract_otp_secrets.py - - os: macos-13 + - os: macos-15-intel TARGET: macos # https://pyinstaller.org/en/stable/spec-files.html#spec-file-options-for-a-macos-bundle EXE: extract_otp_secrets @@ -271,19 +272,19 @@ jobs: pyinstaller -y extract_otp_secrets_macos.spec installer/build_dmg.sh # Disable WARN: Cannot import pyzbar module. This problem is probably due to the missing zbar shared library. - # - os: macos-14 - # TARGET: macos - # # https://pyinstaller.org/en/stable/spec-files.html#spec-file-options-for-a-macos-bundle - # EXE: extract_otp_secrets - # ASSET_NAME: extract_otp_secrets${{ needs.create-release.outputs.inline_version }}_macos_arm64 - # DMG: extract_otp_secrets.dmg - # ASSET_NAME_DMG: extract_otp_secrets${{ needs.create-release.outputs.inline_version }}_macos_arm64.dmg - # ASSET_MIME: application/octet-stream - # UPLOAD: true - # CMD_BUILD: | - # VERSION_STR=$(setuptools-git-versioning) COPYRIGHT_YEARS='2020-2025' envsubst < installer/extract_otp_secrets_macos_template.spec > extract_otp_secrets_macos.spec - # pyinstaller -y extract_otp_secrets_macos.spec - # installer/build_dmg.sh + - os: macos-14 + TARGET: macos + # https://pyinstaller.org/en/stable/spec-files.html#spec-file-options-for-a-macos-bundle + EXE: extract_otp_secrets + ASSET_NAME: extract_otp_secrets${{ needs.create-release.outputs.inline_version }}_macos_arm64 + DMG: extract_otp_secrets.dmg + ASSET_NAME_DMG: extract_otp_secrets${{ needs.create-release.outputs.inline_version }}_macos_arm64.dmg + ASSET_MIME: application/octet-stream + UPLOAD: true + CMD_BUILD: | + VERSION_STR=$(setuptools-git-versioning) COPYRIGHT_YEARS='2020-2025' envsubst < installer/extract_otp_secrets_macos_template.spec > extract_otp_secrets_macos.spec + pyinstaller -y extract_otp_secrets_macos.spec + installer/build_dmg.sh steps: - name: Output path if: runner.os == 'Windows'