From 43d8672d601fbdc151a0d93c8301c9fbc066be5e Mon Sep 17 00:00:00 2001
From: Eric Gallager <egall@gwmail.gwu.edu>
Date: Sun, 17 Nov 2024 21:59:15 -0500
Subject: [PATCH] minor workflow tweaks

Change-Id: I13aadfd42df83e8d9687888b2c418c8c98cd3001
---
 .github/workflows/apple-gdb-1824-macos.yml |  4 ++--
 .github/workflows/apple-gdb-1824.yml       |  2 +-
 .github/workflows/codeql.yml               | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/apple-gdb-1824-macos.yml b/.github/workflows/apple-gdb-1824-macos.yml
index 928e75e2..9aad0571 100644
--- a/.github/workflows/apple-gdb-1824-macos.yml
+++ b/.github/workflows/apple-gdb-1824-macos.yml
@@ -106,7 +106,7 @@ jobs:
           export PPC_CONFIG_PATH=/opt/sw/etc/; \
         fi
         sync && printf '\n' && sync && date && sync
-    - run: cd .profile.d && test -e ./.profile_generic && test -r ./.profile_generic && test -s ./.profile_generic && sync && source ./.profile_generic && sync && (env | uniq | sort | uniq | grep -v "\*\*\*" | grep -v "PWD\=") && sync && sleep 1
+    - run: cd .profile.d && test -e ./.profile_generic && test -r ./.profile_generic && test -s ./.profile_generic && sync && source ./.profile_generic && sync && (env | uniq | sort | uniq | grep -v "\*\*\*" | grep -v "PWD\=") && sync && (if test -x "$(which xcode-select)"; then stat "$(which xcode-select)" && xcode-select --print-path && xcode-select --version; else echo "no usable xcode-select found"; fi)
     - run: ./configure --enable-silent-rules --disable-dependency-tracking CC="sccache ${{ matrix.compiler }}" OBJC="sccache ${{ matrix.compiler }}"
     - run: make -ki -C libcheckpoint || make -ki -C libcheckpoint -f Makefile_orig || make -ki -C macsbug || make -ki -C macsbug/gdb_plugin_support || (if test -x "$(which ant)"; then (ant || echo "FIXME, ant build is broken!"); else echo "ant missing"; fi)
     - run: if test ! -e libcheckpoint/libcheckpoint.dylib; then (sync && echo "ensuring libcheckpoint is built" && sync && make -ki -C libcheckpoint -f Makefile_orig RC_CFLAGS="-std=gnu89 -w -Wno-error" && sync) || (sync && make -ki -C macsbug && sync) || (sync && make -ki -C macsbug/gdb_plugin_support && sync) || (if test -x "$(which ant)"; then ant; else echo "ant missing"; fi); else (sync && stat libcheckpoint/libcheckpoint.dylib && sync); fi
@@ -427,7 +427,7 @@ jobs:
         sync && echo "...done cleaning up."
         time (sync && pwd && sync && ls && sync && du && sync && df && sync)
     - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v4.4.3
+      uses: actions/upload-artifact@v4
       if: "${{ always() }}"
       with:
         # Artifact name
diff --git a/.github/workflows/apple-gdb-1824.yml b/.github/workflows/apple-gdb-1824.yml
index 4c58c982..f90b6310 100644
--- a/.github/workflows/apple-gdb-1824.yml
+++ b/.github/workflows/apple-gdb-1824.yml
@@ -77,7 +77,7 @@ jobs:
       - run: (time (pwd && sync && ls && sync && stat . && sync)) && sleep 1 && echo "done"
         if: "${{ success() }}"
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4
         if: "${{ success() }}"
         with:
           # Artifact name
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c8416711..8ae8c2e0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -137,10 +137,10 @@ jobs:
         elif test ${{ matrix.language }} == 'javascript-typescript'; then \
           sudo apt-get -y install node-optionator eslint uglifyjs \
             libjs-modernizr node-babel-eslint npm wkhtmltopdf node-dompurify \
-            libjavascriptcoregtk-4.0-bin webkit2gtk-driver; \
+            libjavascriptcoregtk-4.0-bin webkit2gtk-driver yamllint; \
         elif test ${{ matrix.language }} == 'go'; then \
           sudo apt-get -y install gccgo gccgo-multilib golang golang-go \
-            golang-src golang-ar-dev golang-honnef-go-tools-dev; \
+            golang-src golang-ar-dev golang-honnef-go-tools-dev yamllint; \
         elif test ${{ matrix.language }} == 'csharp'; then \
           sudo apt-get -y install mono-csharp-shell dotnet-host mono-mcs nant \
             nunit mono-xbuild yamllint monodoc-nunit-manual; \
@@ -254,6 +254,8 @@ jobs:
               stat info.min.js && du info.min.js; \
             elif test -x "$(which yamllint)"; then \
               pwd && (yamllint . || yamllint --version); \
+            else \
+              stat "$(which npx)" && npx --version; \
             fi; \
             sync && echo "Done with texinfo javascript."; \
             popd || exit; \
@@ -371,7 +373,7 @@ jobs:
         make -ki -C libcheckpoint || \
           make -ki -C libcheckpoint -f Makefile_orig || \
           make -ki -C macsbug || make -ki -C macsbug/gdb_plugin_support || \
-          (if test -x "$(which ant)"; then ant; fi)
+          (if test -x "$(which ant)"; then ant; else echo "no usable ant"; fi)
         cd src
         if test -x "$(which sccache)"; then \
           ./configure --disable-werror --enable-silent-rules \
@@ -815,7 +817,7 @@ jobs:
         fi
 
     - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v4.4.3
+      uses: actions/upload-artifact@v4
       if: matrix.language == 'c-cpp' && success()
       with:
         # Artifact name: