From fc474a500b8756f899f2b18f2494bc299185baa1 Mon Sep 17 00:00:00 2001
From: lmbelo <lucas.belo@live.com>
Date: Mon, 11 Nov 2024 18:19:15 -0300
Subject: [PATCH] Workflow updates

---
 .github/workflows/pypi.yml         | 46 ++++++++++++++++++------------
 .github/workflows/sphinx-build.yml |  2 +-
 .github/workflows/tests.yml        |  4 +--
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index b6e9551..cbe793c 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build and Install VCL
       run: |
@@ -38,10 +38,10 @@ jobs:
 
     - name: Cache Stubs
       id: cache-stubs
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: .\delphivcl\__init__.pyi
-        key: ${{ runner.os }}-stubs
+        key: ${{ runner.os }}-cache-${{ hashFiles('.\delphivcl\*') }}
         
   build_wheels_win_32:
     name: Build Windows x86 wheels for Python ${{ matrix.python }}
@@ -49,22 +49,24 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
+        python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         include:
           - os: [windows-latest]
             arch: ["x86"]
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Restore Cached Stubs
       id: cache-stubs
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: .\delphivcl\__init__.pyi
-        key: ${{ runner.os }}-stubs
+        key: ${{ runner.os }}-cache-${{ hashFiles('.\delphivcl\*') }}
+        restore-keys: |
+          ${{ runner.os }}-cache-
       
     - name: Set up Python ${{ matrix.python }}
       uses: actions/setup-python@v3
@@ -79,10 +81,11 @@ jobs:
         python setup.py bdist_wheel --plat-name=win32
       
     - name: Save wheel
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
+        name: artifacts-win32-${{ matrix.python }}
         path: dist/*.whl
-        if-no-files-found: error      
+        if-no-files-found: error
 
   build_wheels_win_64:
     name: Build Windows x64 wheels for Python ${{ matrix.python }}
@@ -90,7 +93,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
+        python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
         include:
           - os: [windows-latest]
             arch: ["AMD64"]
@@ -102,10 +105,12 @@ jobs:
 
     - name: Restore Cached Stubs
       id: cache-stubs
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: .\delphivcl\__init__.pyi
-        key: ${{ runner.os }}-stubs
+        key: ${{ runner.os }}-cache-${{ hashFiles('.\delphivcl\*') }}
+        restore-keys: |
+          ${{ runner.os }}-cache-
       
     - name: Set up Python ${{ matrix.python }}
       uses: actions/setup-python@v3
@@ -114,16 +119,17 @@ jobs:
         architecture: "x64"
             
     - name: Build bdist wheel
-      run: |        
+      run: |
         python -m pip install setuptools --upgrade
         python -m pip install wheel --upgrade                
         python setup.py bdist_wheel --plat-name=win_amd64
       
     - name: Save wheel
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
+        name: artifacts-win64-${{ matrix.python }}
         path: dist/*.whl
-        if-no-files-found: error   
+        if-no-files-found: error
 
   upload_pypi_test:
     name: Upload to PyPI test
@@ -136,10 +142,11 @@ jobs:
       id-token: write
     if: github.ref == 'refs/heads/main'
     steps:                       
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          pattern: artifacts-*
           path: dist
+          merge-multiple: true
           
       - name: Publish package to TestPyPI      
         uses: pypa/gh-action-pypi-publish@release/v1
@@ -157,10 +164,11 @@ jobs:
       id-token: write
     if: startsWith(github.ref, 'refs/tags/v')
     steps:                       
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          pattern: artifacts-*
           path: dist
+          merge-multiple: true
           
       - name: Publish package to PyPI      
         uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file
diff --git a/.github/workflows/sphinx-build.yml b/.github/workflows/sphinx-build.yml
index f19a4ec..c102b53 100644
--- a/.github/workflows/sphinx-build.yml
+++ b/.github/workflows/sphinx-build.yml
@@ -14,7 +14,7 @@ jobs:
   docs:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v3
       - uses: ts-graphviz/setup-graphviz@v1
       - name: Install dependencies
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f42b658..2e9b0d6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,10 +17,10 @@ jobs:
         config:
           - { os: windows-latest, arch: AMD64, python-arch: x64, name: windows-latest-x64 }
           - { os: windows-latest, arch: x86, python-arch: x86, name: windows-latest-x86 }
-        python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
+        python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
     steps:
     - name: Check out repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       
     - name: Set up Python ${{ matrix.python }}
       uses: actions/setup-python@v3