From dd8fa9f4c0344cb62427fec4fa8226e4cbc6a0cf Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 6 Sep 2024 19:37:07 -0700 Subject: [PATCH] Fix workflow and bump version --- .github/workflows/ci.yml | 39 +++++++++++---------------------------- src/ppbt/__init__.py | 2 +- src/ppbt/build.py | 1 - 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c6f193..59a13ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,15 +53,6 @@ jobs: with: changed-files: ${{ needs.get-changed-files.outputs.changed-files }} - build-python-package: - name: Python Package - uses: ./.github/workflows/package-action.yml - if: always() - needs: - - pre-commit - with: - kind: "${{ inputs.kind }}" - cmd: "${{ inputs.package_command }}" test: name: Test @@ -71,6 +62,16 @@ jobs: with: changed-files: ${{ needs.get-changed-files.outputs.changed-files }} + build-python-package: + name: Python Package + uses: ./.github/workflows/package-action.yml + needs: + - pre-commit + - test + with: + kind: "${{ inputs.kind }}" + cmd: "${{ inputs.package_command }}" + deploy-python-package: name: Deploy Python Package uses: ./.github/workflows/deploy-package-action.yml @@ -80,24 +81,6 @@ jobs: - test - build-python-package - push-tag: - name: Push Version Tag - runs-on: ubuntu-latest - permissions: - contents: write - if: ${{ inputs.kind == 'release' && success() }} - needs: - - build-python-package - - deploy-python-package - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Push Tag - uses: rickstaa/action-create-tag@v1 - with: - tag: "v${{ needs.build-python-package.outputs.version }}" - message: "Version ${{ needs.build-python-package.outputs.version }}" - create-release: name: Create Github Release runs-on: ubuntu-latest @@ -131,7 +114,7 @@ jobs: - pre-commit - test - deploy-python-package - - push-tag + - create-release steps: - name: Get workflow information id: get-workflow-info diff --git a/src/ppbt/__init__.py b/src/ppbt/__init__.py index ba9b172..2fa22ed 100644 --- a/src/ppbt/__init__.py +++ b/src/ppbt/__init__.py @@ -5,6 +5,6 @@ """ from .common import environ, extract -__version__ = "0.1.2" +__version__ = "0.1.3" ALL = ("environ", "extract") diff --git a/src/ppbt/build.py b/src/ppbt/build.py index bf20122..339b45a 100644 --- a/src/ppbt/build.py +++ b/src/ppbt/build.py @@ -206,7 +206,6 @@ def build_ppbt(branch=None, use_tempdir=True): - Add patchelf to the toolchain's binaries - Create a tarball to be included in the wheel """ - return cwd = pathlib.Path(os.getcwd()) root = pathlib.Path(os.environ.get("PWD", os.getcwd())) build = root / "build"