From a5c32db01b42d12d5c65e26f162ae220f8f2a0f1 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Wed, 8 Nov 2023 11:25:23 +0100
Subject: [PATCH] CI updates

---
 .github/workflows/ci.yml                               | 4 ++--
 .github/workflows/github-close-inactive-issues.yml     | 2 +-
 .github/workflows/github-close-pull-requests.yml       | 2 +-
 .github/workflows/weekly-ci-bs-cmake-windows-make.yml  | 2 +-
 .github/workflows/weekly-ci-bs-cmake-windows-ninja.yml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1edcb817..18adfb6f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -307,8 +307,8 @@ jobs:
         run: |
           git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite
           mkdir -p -v build/$C/$B/{bzip2,ucl,upx,zlib,zstd}
-          repo_name="${GITHUB_REPOSITORY##*/}" # basename
-          echo "H=d:\\a\\$repo_name\\$repo_name" >> $GITHUB_ENV
+          repository_name="${GITHUB_REPOSITORY##*/}" # basename
+          echo "H=d:\\a\\$repository_name\\$repository_name" >> $GITHUB_ENV
       - name: 'Set up Developer Command Prompt'
         uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1
         with:
diff --git a/.github/workflows/github-close-inactive-issues.yml b/.github/workflows/github-close-inactive-issues.yml
index 177df8a4..1e1d15ea 100644
--- a/.github/workflows/github-close-inactive-issues.yml
+++ b/.github/workflows/github-close-inactive-issues.yml
@@ -18,7 +18,7 @@ on:
   workflow_dispatch:
 jobs:
   job-close-inactive-issues:
-    if: github.repository_owner == 'upx'
+    if: github.repository_owner == 'upx' && github.repository == 'upx/upx'
     name: 'Close inactive issues'
     runs-on: ubuntu-latest
     permissions:
diff --git a/.github/workflows/github-close-pull-requests.yml b/.github/workflows/github-close-pull-requests.yml
index d390cfcd..bc0a979a 100644
--- a/.github/workflows/github-close-pull-requests.yml
+++ b/.github/workflows/github-close-pull-requests.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 jobs:
   job-close-pull-requests:
-    if: github.repository_owner == 'upx'
+    if: github.repository_owner == 'upx' && github.repository == 'upx/upx'
     name: 'Close pull requests'
     runs-on: ubuntu-latest
     permissions:
diff --git a/.github/workflows/weekly-ci-bs-cmake-windows-make.yml b/.github/workflows/weekly-ci-bs-cmake-windows-make.yml
index a58a8247..c8b024a0 100644
--- a/.github/workflows/weekly-ci-bs-cmake-windows-make.yml
+++ b/.github/workflows/weekly-ci-bs-cmake-windows-make.yml
@@ -40,7 +40,7 @@ jobs:
     env:
       CC: ${{ matrix.cc }} ${{ matrix.xflags }}
       CXX: ${{ matrix.cxx }} ${{ matrix.xflags }}
-    name: ${{ format('{0} {1} {2}', matrix.cc, matrix.vsversion, matrix.arch) }}
+    name: ${{ format('{0} {1} {2} {3}', matrix.cc, matrix.vsversion, matrix.arch, matrix.os) }}
     runs-on: ${{ matrix.os }}
     steps:
       - run: git config --global core.autocrlf false
diff --git a/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml b/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml
index b58bb87a..6f48806c 100644
--- a/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml
+++ b/.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml
@@ -38,7 +38,7 @@ jobs:
     env:
       CC: ${{ matrix.cc }} ${{ matrix.xflags }}
       CXX: ${{ matrix.cxx }} ${{ matrix.xflags }}
-    name: ${{ format('{0} {1} {2}', matrix.cc, matrix.vsversion, matrix.arch) }}
+    name: ${{ format('{0} {1} {2} {3}', matrix.cc, matrix.vsversion, matrix.arch, matrix.os) }}
     runs-on: ${{ matrix.os }}
     steps:
       - run: git config --global core.autocrlf false