From 548bd2acda1b72def7a2ed3d002e04f038e7cbfe Mon Sep 17 00:00:00 2001 From: laggykiller Date: Fri, 8 Sep 2023 16:55:51 +0800 Subject: [PATCH] v1.0.5 --- .github/workflows/build.yaml | 172 +++++++++++++------------- CMakeLists.txt | 2 +- src-python/apngasm_python/__init__.py | 2 +- 3 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9f174d3..b519538 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,8 +2,8 @@ name: Build and upload to PyPI on: push: - # tags: - # - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + tags: + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 # release: # types: # - [published] @@ -16,24 +16,24 @@ jobs: fail-fast: false matrix: include: - # - os: windows-2019 - # arch: x64 - # submodules_mode: true - # cibw_archs_windows: AMD64 - # cibw_environment: APNGASM_COMPILE_TARGET=x64 - # cibw_before_all: prepare-win.bat - # - os: windows-2019 - # arch: x86 - # submodules_mode: true - # cibw_archs_windows: x86 - # cibw_environment: APNGASM_COMPILE_TARGET=x86 - # cibw_before_all: prepare-win.bat - # - os: windows-2019 - # arch: arm64 - # submodules_mode: true - # cibw_archs_windows: ARM64 - # cibw_environment: APNGASM_COMPILE_TARGET=ARM64 - # cibw_before_all: prepare-win.bat + - os: windows-2019 + arch: x64 + submodules_mode: true + cibw_archs_windows: AMD64 + cibw_environment: APNGASM_COMPILE_TARGET=x64 + cibw_before_all: prepare-win.bat + - os: windows-2019 + arch: x86 + submodules_mode: true + cibw_archs_windows: x86 + cibw_environment: APNGASM_COMPILE_TARGET=x86 + cibw_before_all: prepare-win.bat + - os: windows-2019 + arch: arm64 + submodules_mode: true + cibw_archs_windows: ARM64 + cibw_environment: APNGASM_COMPILE_TARGET=ARM64 + cibw_before_all: prepare-win.bat - os: macos-11 arch: x64 submodules_mode: true @@ -72,58 +72,58 @@ jobs: CMAKE_OSX_DEPLOYMENT_TARGET=11.0 VCPKG_C_FLAGS="-mmacosx-version-min=11.0" VCPKG_CXX_FLAGS="-mmacosx-version-min=11.0" - # - os: ubuntu-20.04 - # arch: x64 - # submodules_mode: true - # cibw_archs_linux: x86_64 - # cibw_before_all: ./prepare-linux.sh - # - os: ubuntu-20.04 - # arch: x86 - # submodules_mode: true - # cibw_archs_linux: i686 - # cibw_before_all: ./prepare-linux.sh - # - os: ubuntu-20.04 - # arch: arm64 - # submodules_mode: true - # cibw_archs_linux: aarch64 - # cibw_skip: "*-muslinux_* pp*" - # cibw_before_all: ./prepare-linux.sh - # - os: ubuntu-20.04 - # arch: arm64 - # submodules_mode: true - # cibw_archs_linux: aarch64 - # cibw_skip: "*-multilinux_* pp*" - # cibw_before_all: ./prepare-linux.sh - # - os: ubuntu-20.04 - # arch: arm64 - # submodules_mode: true - # cibw_archs_linux: aarch64 - # cibw_skip: "*-muslinux_* *-multilinux_*" - # cibw_before_all: ./prepare-linux.sh - # - os: ubuntu-20.04 - # arch: ppc64le - # submodules_mode: true - # cibw_archs_linux: ppc64le - # cibw_skip: "*-muslinux_*" - # cibw_before_all: ./prepare-linux.sh - # - os: ubuntu-20.04 - # arch: ppc64le - # submodules_mode: true - # cibw_archs_linux: ppc64le - # cibw_skip: "*-multilinux_*" - # cibw_before_all: ./prepare-linux.sh - # - os: ubuntu-20.04 - # arch: s390x - # submodules_mode: true - # cibw_archs_linux: s390x - # cibw_skip: "*-muslinux_*" - # cibw_before_all: ./prepare-linux.sh - # - os: ubuntu-20.04 - # arch: s390x - # submodules_mode: true - # cibw_archs_linux: s390x - # cibw_skip: "*-multilinux_*" - # cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: x64 + submodules_mode: true + cibw_archs_linux: x86_64 + cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: x86 + submodules_mode: true + cibw_archs_linux: i686 + cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: arm64 + submodules_mode: true + cibw_archs_linux: aarch64 + cibw_skip: "*-muslinux_* pp*" + cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: arm64 + submodules_mode: true + cibw_archs_linux: aarch64 + cibw_skip: "*-multilinux_* pp*" + cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: arm64 + submodules_mode: true + cibw_archs_linux: aarch64 + cibw_skip: "*-muslinux_* *-multilinux_*" + cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: ppc64le + submodules_mode: true + cibw_archs_linux: ppc64le + cibw_skip: "*-muslinux_*" + cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: ppc64le + submodules_mode: true + cibw_archs_linux: ppc64le + cibw_skip: "*-multilinux_*" + cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: s390x + submodules_mode: true + cibw_archs_linux: s390x + cibw_skip: "*-muslinux_*" + cibw_before_all: ./prepare-linux.sh + - os: ubuntu-20.04 + arch: s390x + submodules_mode: true + cibw_archs_linux: s390x + cibw_skip: "*-multilinux_*" + cibw_before_all: ./prepare-linux.sh steps: - uses: actions/checkout@v3 @@ -183,18 +183,18 @@ jobs: # password: ${{ secrets.TEST_PYPI_API_TOKEN }} # repository_url: https://test.pypi.org/legacy/ - # upload_pypi: - # needs: [build_wheels, build_sdist] - # runs-on: ubuntu-latest - # steps: - # - uses: actions/download-artifact@v3 - # with: - # # unpacks default artifact into dist/ - # # if `name: artifact` is omitted, the action will create extra parent dir - # name: artifact - # path: dist + upload_pypi: + needs: [build_wheels, build_sdist] + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v3 + with: + # unpacks default artifact into dist/ + # if `name: artifact` is omitted, the action will create extra parent dir + name: artifact + path: dist - # - uses: pypa/gh-action-pypi-publish@v1.5.0 - # with: - # user: __token__ - # password: ${{ secrets.PYPI_API_TOKEN }} \ No newline at end of file + - uses: pypa/gh-action-pypi-publish@v1.5.0 + with: + user: __token__ + password: ${{ secrets.PYPI_API_TOKEN }} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 869b909..366d201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ else() endif() endif() -project(apngasm-python VERSION 1.0.4) +project(apngasm-python VERSION 1.0.5) set(PY_VERSION_SUFFIX "") set(PY_FULL_VERSION ${PROJECT_VERSION}${PY_VERSION_SUFFIX}) diff --git a/src-python/apngasm_python/__init__.py b/src-python/apngasm_python/__init__.py index 42009ea..b22aae9 100644 --- a/src-python/apngasm_python/__init__.py +++ b/src-python/apngasm_python/__init__.py @@ -1,4 +1,4 @@ '''apngasm-python''' -__version__ = '1.0.4' +__version__ = '1.0.5' from .apngasm import APNGAsmBinder \ No newline at end of file