diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9445823..ba67cd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,14 +20,14 @@ jobs: fail-fast: false matrix: os: - - name: Linux - runs-on: ubuntu-latest - python_platform: linux - container: docker://python:{0}-buster - - name: Windows - runs-on: windows-latest - python_platform: win32 - vs_path: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat +# - name: Linux +# runs-on: ubuntu-latest +# python_platform: linux +# container: docker://python:{0}-buster +# - name: Windows +# runs-on: windows-latest +# python_platform: win32 +# vs_path: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat - name: macOS runs-on: macos-latest python_platform: darwin @@ -71,8 +71,9 @@ jobs: QT_VERSION: ${{ matrix.qt.qt_version }} steps: - - name: Checkout - uses: actions/checkout@v1 + - uses: actions/checkout@v1 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Set up Python ${{ matrix.python.name }}-${{ matrix.bitness.name }} if: matrix.os.python_platform != 'linux' uses: actions/setup-python@v2 @@ -141,14 +142,14 @@ jobs: fail-fast: false matrix: os: - - name: Linux - runs-on: ubuntu-latest - python_platform: linux - container: docker://python:{0}-buster - - name: Windows - runs-on: windows-latest - python_platform: win32 - vs_path: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat +# - name: Linux +# runs-on: ubuntu-latest +# python_platform: linux +# container: docker://python:{0}-buster +# - name: Windows +# runs-on: windows-latest +# python_platform: win32 +# vs_path: C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat - name: macOS runs-on: macos-latest python_platform: darwin @@ -208,8 +209,9 @@ jobs: QT_VERSION: ${{ matrix.qt.qt_version }} steps: - - name: Checkout - uses: actions/checkout@v1 + - uses: actions/checkout@v1 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Download uses: actions/download-artifact@v1 with: @@ -265,8 +267,9 @@ jobs: needs: - test steps: - - name: Checkout - uses: actions/checkout@v1 + - uses: actions/checkout@v1 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Download all wheels uses: actions/download-artifact@v1 with: diff --git a/build.py b/build.py index 6aa2848..78a56c1 100644 --- a/build.py +++ b/build.py @@ -1073,6 +1073,12 @@ def exclude_webengine_filter(path): action.linux_less_specific_so_target() for action in copy_actions } + elif configuration.platform == 'darwin': + copy_actions = { + action + for action in copy_actions + if action.destination.suffix != '.a' + } checkpoint('Write Applications dict') applications_py = destinations.package / '_applications.py' diff --git a/setup.py b/setup.py index f479eb7..336f005 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ def pad_version(v, segment_count=3): # in some other way? qt_version = pad_version(os.environ.setdefault('QT_VERSION', '5.15.1')) -qt5_applications_wrapper_version = versioneer.get_versions()['version'] +qt5_applications_wrapper_version = '2.1' qt5_applications_version = '{}.{}'.format(qt_version, qt5_applications_wrapper_version)