Update MSYS2 keyring

geany · Sep 17, 2022 · ee8ff28 · ee8ff28
1 parent 18dc699
commit ee8ff28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/builders/Dockerfile.mingw64 b/builders/Dockerfile.mingw64
@@ -13,8 +13,8 @@ FROM debian:bullseye as build-pacman
 
 ENV PACMAN_VERSION=6.0.1
 ENV PACMAN_SHA256="0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731"
-ENV MSYS2_KEYRING_PKG="msys2-keyring-1~20211228-1-any.pkg.tar.zst"
-ENV MSYS2_KEYRING_PKG_SHA256="1ef41c9c7c829e2612020cfa41136f552b509a8269fdb7fbbeddc59329c9b11b"
+ENV MSYS2_KEYRING_PKG="msys2-keyring-1~20220623-1-any.pkg.tar.zst"
+ENV MSYS2_KEYRING_PKG_SHA256="3508c7fca2f8b9722139666459eb8716f2413fd6daaf997abf0df41d7f285dc9"
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/pacman/lib/x86_64-linux-gnu
 
 RUN set -ex && \

diff --git a/builders/scripts/build_mingw64_geany_plugins.sh b/builders/scripts/build_mingw64_geany_plugins.sh
@@ -23,7 +23,7 @@
 #
 
 GEANY_PLUGINS_VERSION=  # will be set below from configure.ac
-GEANY_PLUGINS_GIT_REVISION=  # will be set below from configure.ac
+GEANY_PLUGINS_GIT_REVISION=  # will be set below 
 OUTPUT_DIRECTORY="/output"
 GEANY_PLUGINS_GIT_REPOSITORY="https://github.com/geany/geany-plugins.git"
 
@@ -142,7 +142,7 @@ log_environment() {
 patch_version_information() {
 	log "Patching version information"
 
-	if [ -z "${GEANY_PLUGINS_GIT_REVISION}" ] && [ -z "${TRAVIS_PULL_REQUEST}" ]; then
+	if [ -z "${GEANY_PLUGINS_GIT_REVISION}" ]; then
 		return
 	fi