From 9aabb58ba226e0eccfb76668651d2fcafa385cc4 Mon Sep 17 00:00:00 2001
From: Gregorio Litenstein <g.litenstein@gmail.com>
Date: Mon, 22 Jul 2024 10:17:58 -0400
Subject: [PATCH] Fix references to gvsbuild-release

All files now consolidated under a single release. Optional input to build with a different version of the gvsbuild-release.
---
 .github/workflows/cd.yml | 20 ++++++++++++++------
 .github/workflows/ci.yml | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 3c1d6d51fa..860b73a1f8 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -16,6 +16,10 @@ on:
       ref:
         description: "Enter a tag or commit to package"
         default: ""
+      gvsbuild-tag:
+        description: "Use an alternative gvsbuild release for the windows build. Defaults to latest."
+        default: "latest"
+
 jobs:
   windows_package:
     runs-on: windows-2022
@@ -23,12 +27,8 @@ jobs:
     strategy:
       matrix:
         arch: [x64, x86]
-        python: ["3.10"]
-        gvsbuild-stack: ["latest"]
+        python: ["3.7", "3.10"]
         libtorrent: [2.0.8, 1.2.19]
-        include:
-          - python: 3.7
-            gvsbuild-stack: older
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -54,10 +54,18 @@ jobs:
       - name: Prepare pip
         run: python -m pip install wheel setuptools==70.*
 
+      - name: Determine gvsbuild release URL
+        id: gvsbuild-url
+        shell: bash
+        run: |
+          test -z "${{ github.event.inputs.gvsbuild-tag }}" && tag=latest || tag="${{ github.event.inputs.gvsbuild-tag }}"
+          if [[ "$tag" == "latest" ]]; then URL="https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/latest/download"; else URL="https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/download/$tag" ; fi
+          echo "gvsbuild-release-url=$URL" >> $GITHUB_OUTPUT
+
       - name: Install GTK
         run: |
           $WebClient = New-Object System.Net.WebClient
-          $WebClient.DownloadFile("https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/download/${{ matrix.gvsbuild-stack }}/gvsbuild-py${{ matrix.python }}-vs17-${{ matrix.arch }}.zip","C:\GTK.zip")
+          $WebClient.DownloadFile("${{ steps.gvsbuild-url.outputs.gvsbuild-release-url }}/$tag/gvsbuild-py${{ matrix.python-version }}-vs17-${{matrix.arch}}.zip","C:\GTK.zip")
           7z x C:\GTK.zip -oc:\GTK
           echo "C:\GTK\release\lib" | Out-File -FilePath $env:GITHUB_PATH -Append
           echo "C:\GTK\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c418b06187..cba08f760f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,9 @@ on:
       core-dump:
         description: "Set to 1 to enable retrieving core dump from crashes"
         default: "0"
+      gvsbuild-tag:
+        description: "Use an alternative gvsbuild release for the windows build. Defaults to latest."
+        default: "latest"
 jobs:
   test-linux:
     strategy:
@@ -78,11 +81,8 @@ jobs:
     runs-on: windows-2022
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
-        gvsbuild-stack: ["latest"]
-        include:
-          - python-version: 3.7
-            gvsbuild-stack: older
+        python-version: ["3.7", "3.9", "3.10"]
+        arch: ["x64"]
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -97,10 +97,18 @@ jobs:
           cache: "pip"
           cache-dependency-path: "requirements*.txt"
 
+      - name: Determine gvsbuild release URL
+        id: gvsbuild-url
+        shell: bash
+        run: |
+          test -z "${{ github.event.inputs.gvsbuild-tag }}" && tag=latest || tag="${{ github.event.inputs.gvsbuild-tag }}"
+          if [[ "$tag" == "latest" ]]; then URL="https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/latest/download"; else URL="https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/download/$tag" ; fi
+          echo "gvsbuild-release-url=$URL" >> $GITHUB_OUTPUT
+
       - name: Install GTK
         run: |
           $WebClient = New-Object System.Net.WebClient
-          $WebClient.DownloadFile("https://github.com/${{ github.repository_owner }}/gvsbuild-release/releases/download/${{ matrix.gvsbuild-stack }}/gvsbuild-py${{ matrix.python-version }}-vs17-x64.zip","C:\GTK.zip")
+          $WebClient.DownloadFile("${{ steps.gvsbuild-url.outputs.gvsbuild-release-url }}/$tag/gvsbuild-py${{ matrix.python-version }}-vs17-${{matrix.arch}}.zip","C:\GTK.zip")
           7z x C:\GTK.zip -oc:\GTK
           echo "C:\GTK\release\lib" | Out-File -FilePath $env:GITHUB_PATH -Append
           echo "C:\GTK\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Append