diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cb93108..dc4d579 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 30 strategy: - fail-fast: true + fail-fast: false matrix: os: [macos-13, macos-12] platform: [arm64, x86_x64] @@ -59,8 +59,12 @@ jobs: git submodule update --init --recursive - name: Build run: | - sh build.sh + sh build.sh nowheel pip install pychoco -f dist/ + - name: Build wheels + uses: pypa/cibuildwheel@v2.21.1 + with: + output-dir: dist - name: Test run: | pip install pytest @@ -77,7 +81,7 @@ jobs: upload-pypi-macos: needs: build-macos runs-on: ubuntu-20.04 - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + #if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') strategy: matrix: os: [macos-13, macos-12] diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d5bea5d..5f147e7 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -2,7 +2,8 @@ name: Ubuntu on: push: - branches: [ "master", "dev_actions" ] + branches: ["no"] +# branches: [ "master", "dev_actions" ] tags: [ '**' ] jobs: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d909fe2..08dcec9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -2,7 +2,8 @@ name: Windows on: push: - branches: [ "master", "dev_actions" ] + branches: ["no"] +# branches: [ "master", "dev_actions" ] tags: [ '**' ] jobs: diff --git a/build.sh b/build.sh index 3130249..c42077b 100644 --- a/build.sh +++ b/build.sh @@ -20,10 +20,12 @@ swig -python -py3 pychoco/backend.i #pip3 install . python3 setup.py develop -e -b . -pip install wheel -OS=`uname` -if [ "$OS" = "Linux" ]; then - python setup.py bdist_wheel --plat manylinux2014_x86_64 -else - python3 setup.py bdist_wheel -fi +if [$1 != "nowheel"] + pip install wheel + OS=`uname` + if [ "$OS" = "Linux" ]; then + python setup.py bdist_wheel --plat manylinux2014_x86_64 + else + python3 setup.py bdist_wheel + fi +fi \ No newline at end of file