From a49f6fe8c28cc5765428f7a1a40423235f858cd1 Mon Sep 17 00:00:00 2001 From: Leon Thomm Date: Mon, 20 May 2024 17:48:05 +0200 Subject: [PATCH] update workflows --- .github/workflows/publish-ryven.yml | 14 +++++++------- .github/workflows/publish-ryvencore-qt.yml | 14 +++++++------- .github/workflows/type-checking.yml | 11 +++++++---- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish-ryven.yml b/.github/workflows/publish-ryven.yml index e654e50b..047a01f9 100644 --- a/.github/workflows/publish-ryven.yml +++ b/.github/workflows/publish-ryven.yml @@ -1,4 +1,4 @@ -name: Publish Ryven wheel to TestPyPi and PyPi +name: Publish Ryven wheel to PyPi on: create: tags: @@ -18,12 +18,12 @@ jobs: - name: Build binary wheel and source tarball run: python -m build --sdist --wheel --outdir dist/ working-directory: ./ryven-editor - - name: Publish distribution to TestPyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.GH_AC_RYVEN_TEST_PYPI_API_TOKEN }} - repository-url: https://test.pypi.org/legacy/ - packages-dir: ryven-editor/dist/ + # - name: Publish distribution to TestPyPI + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # password: ${{ secrets.GH_AC_RYVEN_TEST_PYPI_API_TOKEN }} + # repository-url: https://test.pypi.org/legacy/ + # packages-dir: ryven-editor/dist/ - name: Publish distribution to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: diff --git a/.github/workflows/publish-ryvencore-qt.yml b/.github/workflows/publish-ryvencore-qt.yml index 0de53e94..d36a8ac5 100644 --- a/.github/workflows/publish-ryvencore-qt.yml +++ b/.github/workflows/publish-ryvencore-qt.yml @@ -1,4 +1,4 @@ -name: Publish ryvencore-qt wheel to TestPyPi and PyPi +name: Publish ryvencore-qt wheel to PyPi on: create: tags: @@ -18,12 +18,12 @@ jobs: - name: Build binary wheel and source tarball run: python -m build --sdist --wheel --outdir dist/ working-directory: ./ryvencore-qt - - name: Publish distribution to TestPyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.GH_AC_RCQT_TEST_PYPI_API_TOKEN }} - repository-url: https://test.pypi.org/legacy/ - packages-dir: ryvencore-qt/dist/ + # - name: Publish distribution to TestPyPI + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # password: ${{ secrets.GH_AC_RCQT_TEST_PYPI_API_TOKEN }} + # repository-url: https://test.pypi.org/legacy/ + # packages-dir: ryvencore-qt/dist/ - name: Publish distribution to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: diff --git a/.github/workflows/type-checking.yml b/.github/workflows/type-checking.yml index 87f97175..c236d6bc 100644 --- a/.github/workflows/type-checking.yml +++ b/.github/workflows/type-checking.yml @@ -18,16 +18,19 @@ jobs: python-version: 3.10.x architecture: x64 # if we are not on the main branch, install ryvencore from the dev branch from github - # otherise, install ryvencore from pypi + # otherise, install ryvencore from the main branch from github - if: github.ref != 'refs/heads/main' run: python -m pip install git+https://github.com/leon-thomm/ryvencore.git@dev - if: github.ref == 'refs/heads/main' - run: python -m pip install ryvencore + run: python -m pip install git+https://github.com/leon-thomm/ryvencore.git@main - name: Install ryvencore-qt dependencies - run: python -m pip install . --user && python -m pip uninstall ryvencore-qt --yes + run: python -m pip install . --user working-directory: ./ryvencore-qt - name: Install Ryven dependencies - run: python -m pip install . --user && python -m pip uninstall ryven --yes + run: python -m pip install . --user + working-directory: ./ryven-editor + - name: Uninstall ryvencore-qt and ryven (keep dependencies) + run: python -m pip uninstall ryven ryvencore-qt --yes working-directory: ./ryven-editor - name: Install type-checking dependencies run: python -m pip install mypy pyside2 pyside6 PySide6-stubs types-Pygments --user