From 9ee8d4e39025f6caf65ab98daf4640bdb18eb6a1 Mon Sep 17 00:00:00 2001
From: Mirko Galimberti <me@mirkogalimberti.com>
Date: Fri, 8 Dec 2023 09:53:56 +0100
Subject: [PATCH] [publish angle win] Update `angle` version and add Python
 `3.12` to matrix for `angle` and update Github Actions for related jobs (#99)

* Add Python 3.12 to matrix for angle and update Github Actions for related jobs

* Seems to fail for no reason. Test windows-latest

* Update tracked branch for angle and update version

* New download-artifact version works differently
---
 .github/workflows/windows_angle_wheels.yml | 17 +++++++++--------
 ci/windows_ci.ps1                          |  2 +-
 win/angle.py                               |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/windows_angle_wheels.yml b/.github/workflows/windows_angle_wheels.yml
index f502a65..eeda620 100644
--- a/.github/workflows/windows_angle_wheels.yml
+++ b/.github/workflows/windows_angle_wheels.yml
@@ -20,11 +20,11 @@ env:
 
 jobs:
   prepare_angle:
-    runs-on: windows-2019
+    runs-on: windows-latest
     env:
       DEPOT_TOOLS_WIN_TOOLCHAIN: 0
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Get dependecies
         run: |
           . .\ci\windows_ci.ps1
@@ -33,7 +33,7 @@ jobs:
         run: |
           . .\ci\windows_ci.ps1
           Build-angle
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v3
         with:
           name: angle_dlls
           path: angle_dlls
@@ -45,14 +45,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: [ '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        python: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12' ]
         arch: ['x64', 'x86']
     env:
       PACKAGE_ARCH: ${{ matrix.arch }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
         architecture: ${{ matrix.arch }}
@@ -60,15 +60,16 @@ jobs:
       run: |
         . .\ci\windows_ci.ps1
         Prepre-env
-    - uses: actions/download-artifact@v1
+    - uses: actions/download-artifact@v3
       with:
         name: angle_dlls
+        path: angle_dlls
     - name: Build package
       run: |
         . .\ci\windows_ci.ps1
         Create-Packages
     - name: Upload wheels as artifact
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v3
       with:
         name: angle_wheels
         path: dist
diff --git a/ci/windows_ci.ps1 b/ci/windows_ci.ps1
index 66fba40..cdaa605 100644
--- a/ci/windows_ci.ps1
+++ b/ci/windows_ci.ps1
@@ -67,7 +67,7 @@ function Test-kivy() {
 function Get-angle-deps() {
     Invoke-WebRequest -Uri "https://storage.googleapis.com/chrome-infra/depot_tools.zip" -OutFile depot_tools.zip
     7z x depot_tools.zip -odepot_tools
-    git clone -b "chromium/4758" --single-branch https://github.com/google/angle.git angle_src
+    git clone -b "chromium/6045" --single-branch https://github.com/google/angle.git angle_src
 }
 
 function Build-angle() {
diff --git a/win/angle.py b/win/angle.py
index 6504604..35d5f71 100644
--- a/win/angle.py
+++ b/win/angle.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, print_function
 from .common import *
 
-__version__ = '0.3.3'
+__version__ = '0.4.0'
 
 
 def get_angle(cache, build_path, arch, package, output, download_only=False):