From 80a35f632e2cb26a36452afa2be10bb4435a0214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt>
Date: Thu, 19 Jan 2023 23:36:43 +0000
Subject: [PATCH] GitHub: Build MSYS2 commit SHA

The PKGBUILD always builds the tip of the master branch. Try to
allow selecting a commit using $PKG_COMMIT.
---
 .github/workflows/msys2.yml                      | 4 +++-
 packaging/msys2/mingw-w64-wireshark-git/PKGBUILD | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index 124d1af421..5499114c7c 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -16,9 +16,11 @@ jobs:
           update: true
           install: base-devel
       - name: Build
+        env:
+          PKG_COMMIT: ${{ github.sha }}
         run: |
           mkdir build && cd build
-          wget "https://raw.githubusercontent.com/wireshark/wireshark/$GITHUB_SHA/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD"
+          wget "https://raw.githubusercontent.com/wireshark/wireshark/${PKG_COMMIT}/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD"
           makepkg-mingw --cleanbuild --syncdeps --force --install --noconfirm
       - name: Show version
         run: |
diff --git a/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD b/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD
index 48fa6fb782..4432134399 100644
--- a/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD
+++ b/packaging/msys2/mingw-w64-wireshark-git/PKGBUILD
@@ -45,13 +45,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              'git')
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-source=("${_realname}"::"git+https://gitlab.com/wireshark/wireshark.git")
+_commit=${PKG_COMMIT:-HEAD}
+source=("${_realname}"::"git+https://gitlab.com/wireshark/wireshark.git#commit=${_commit}")
 sha256sums=('SKIP')
 
 pkgver() {
   cd "${_realname}"
 
-  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
+  git describe --long "${_commit}" | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
 build() {