Merge branch 'kliment:master' into rm_cairosvg

DivingDuck · Dec 23, 2023 · 19b9449 · 19b9449
2 parents f95a1c2 + d8da0dd
commit 19b9449
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/buildpackage-mac.yml b/.github/workflows/buildpackage-mac.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         architecture: ${{ matrix.architecture }}
         python-version: ${{ matrix.python-version }}
@@ -69,7 +69,7 @@ jobs:
         echo "EXE_NAME=printrun-test" >> $GITHUB_ENV
 
     - name: Upload artifacts for inspection
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.EXE_NAME }}_${{ matrix.os }}_${{ matrix.architecture }}_py${{ matrix.python-version }}
         path: dist/pronterface-app.zip
diff --git a/.github/workflows/buildpackage-win.yml b/.github/workflows/buildpackage-win.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         architecture: ${{ matrix.architecture }}
         python-version: ${{ matrix.python-version }}
@@ -76,7 +76,7 @@ jobs:
         "EXE_NAME=printrun-test" >> $env:GITHUB_ENV
 
     - name: Upload artifacts for inspection
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.EXE_NAME }}_windows_${{ matrix.architecture }}_py${{ matrix.python-version }}
         path: |

diff --git a/.github/workflows/pypi-mac.yml b/.github/workflows/pypi-mac.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         architecture: ${{ matrix.architecture }}
         python-version: ${{ matrix.python-version }}
@@ -32,7 +32,7 @@ jobs:
       run: |
         python setup.py bdist_wheel
     - name: Upload artifacts for inspection
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: wheel_${{ matrix.os }}_${{ matrix.architecture }}_${{ matrix.python-version }}
         path: dist/*.whl

diff --git a/.github/workflows/pypi-manylinux.yml b/.github/workflows/pypi-manylinux.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Install dependencies
@@ -26,7 +26,7 @@ jobs:
         python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
         build-requirements: 'cython'
     - name: Upload artifacts for inspection
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: manylinux_wheels
         path: dist/*-manylinux*.whl

diff --git a/.github/workflows/pypi-sdist.yml b/.github/workflows/pypi-sdist.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.x
     - name: Install dependencies
@@ -24,7 +24,7 @@ jobs:
       run: |
         python setup.py sdist
     - name: Upload artifacts for inspection
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: sdist
         path: dist/*.tar.gz

diff --git a/.github/workflows/pypi-win.yml b/.github/workflows/pypi-win.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         architecture: ${{ matrix.architecture }}
         python-version: ${{ matrix.python-version }}
@@ -32,7 +32,7 @@ jobs:
       run: |
         python setup.py bdist_wheel
     - name: Upload artifacts for inspection
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: wheel_${{ matrix.os }}_${{ matrix.architecture }}_${{ matrix.python-version }}
         path: dist/*.whl

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}