update workflows

leon-thomm · May 20, 2024 · a49f6fe · a49f6fe
1 parent cbe3b02
commit a49f6fe
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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