mirror of
https://github.com/scito/extract_otp_secret_keys.git
synced 2025-12-08 07:45:01 +01:00
fix: update CI configuration to use macOS 15 instead 13 for intel
This commit is contained in:
parent
6b163cd377
commit
96e92dc295
2 changed files with 16 additions and 15 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
|
@ -23,7 +23,7 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
# 3.x is used to run code coverage
|
# 3.x is used to run code coverage
|
||||||
python-version: ["3.x", "3.14", "3.13", "3.12", "3.11", "3.10", "3.9"]
|
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:
|
exclude:
|
||||||
- python-version: "3.14"
|
- python-version: "3.14"
|
||||||
platform: windows-latest
|
platform: windows-latest
|
||||||
|
|
|
||||||
29
.github/workflows/ci_release.yml
vendored
29
.github/workflows/ci_release.yml
vendored
|
|
@ -226,6 +226,7 @@ jobs:
|
||||||
needs: create-release
|
needs: create-release
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners
|
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners
|
||||||
include:
|
include:
|
||||||
|
|
@ -257,7 +258,7 @@ jobs:
|
||||||
UPLOAD: false
|
UPLOAD: false
|
||||||
CMD_BUILD: |
|
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
|
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
|
TARGET: macos
|
||||||
# https://pyinstaller.org/en/stable/spec-files.html#spec-file-options-for-a-macos-bundle
|
# https://pyinstaller.org/en/stable/spec-files.html#spec-file-options-for-a-macos-bundle
|
||||||
EXE: extract_otp_secrets
|
EXE: extract_otp_secrets
|
||||||
|
|
@ -271,19 +272,19 @@ jobs:
|
||||||
pyinstaller -y extract_otp_secrets_macos.spec
|
pyinstaller -y extract_otp_secrets_macos.spec
|
||||||
installer/build_dmg.sh
|
installer/build_dmg.sh
|
||||||
# Disable WARN: Cannot import pyzbar module. This problem is probably due to the missing zbar shared library.
|
# Disable WARN: Cannot import pyzbar module. This problem is probably due to the missing zbar shared library.
|
||||||
# - os: macos-14
|
- os: macos-14
|
||||||
# TARGET: macos
|
TARGET: macos
|
||||||
# # https://pyinstaller.org/en/stable/spec-files.html#spec-file-options-for-a-macos-bundle
|
# https://pyinstaller.org/en/stable/spec-files.html#spec-file-options-for-a-macos-bundle
|
||||||
# EXE: extract_otp_secrets
|
EXE: extract_otp_secrets
|
||||||
# ASSET_NAME: extract_otp_secrets${{ needs.create-release.outputs.inline_version }}_macos_arm64
|
ASSET_NAME: extract_otp_secrets${{ needs.create-release.outputs.inline_version }}_macos_arm64
|
||||||
# DMG: extract_otp_secrets.dmg
|
DMG: extract_otp_secrets.dmg
|
||||||
# ASSET_NAME_DMG: extract_otp_secrets${{ needs.create-release.outputs.inline_version }}_macos_arm64.dmg
|
ASSET_NAME_DMG: extract_otp_secrets${{ needs.create-release.outputs.inline_version }}_macos_arm64.dmg
|
||||||
# ASSET_MIME: application/octet-stream
|
ASSET_MIME: application/octet-stream
|
||||||
# UPLOAD: true
|
UPLOAD: true
|
||||||
# CMD_BUILD: |
|
CMD_BUILD: |
|
||||||
# VERSION_STR=$(setuptools-git-versioning) COPYRIGHT_YEARS='2020-2025' envsubst < installer/extract_otp_secrets_macos_template.spec > extract_otp_secrets_macos.spec
|
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
|
pyinstaller -y extract_otp_secrets_macos.spec
|
||||||
# installer/build_dmg.sh
|
installer/build_dmg.sh
|
||||||
steps:
|
steps:
|
||||||
- name: Output path
|
- name: Output path
|
||||||
if: runner.os == 'Windows'
|
if: runner.os == 'Windows'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue