From 446c05a0010fb0f563359e28c1ffb831e0a8721d Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <anonymous.maarten@gmail.com>
Date: Sun, 28 Jul 2024 13:33:14 +0200
Subject: [PATCH] ci: update actions descriptions + fix loongarch64 action

[sdl-ci-filter *loongarch64*]
---
 .../setup-loongarch64-toolchain/action.yml     | 18 +++++++++++-------
 .github/actions/setup-msvc-libusb/action.yml   |  2 +-
 .github/actions/setup-ninja/action.yml         |  2 +-
 .github/actions/setup-vita-gles/action.yml     |  4 ++--
 .github/workflows/generic.yml                  |  9 ---------
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/actions/setup-loongarch64-toolchain/action.yml b/.github/actions/setup-loongarch64-toolchain/action.yml
index 9cf53eaf4..54698b3a9 100644
--- a/.github/actions/setup-loongarch64-toolchain/action.yml
+++ b/.github/actions/setup-loongarch64-toolchain/action.yml
@@ -1,5 +1,5 @@
-name: 'Setup libusb for MSBC'
-description: 'Greet someone'
+name: 'Setup LoongArch64 toolchain'
+description: 'Download Linux LoongArch64 toolchain and set output variables'
 inputs:
   version:
     description: 'LoongArch64 version'
@@ -21,13 +21,13 @@ runs:
       id: restore-cache
       with:
         path: /opt/cross-tools
-        key: loongarch64-${{ matrix.platform.toolchain-version }}
+        key: loongarch64-${{ inputs.version }}
 
     - name: 'Download LoongArch64 gcc+glibc toolchain'
       if: ${{ !steps.restore-cache.outputs.cache-hit }}
       shell: bash
       run: |
-        url="https://github.com/loongson/build-tools/releases/download/${{ matrix.platform.toolchain-version }}/loongarch64-clfs-6.3-cross-tools-gcc-glibc.tar.xz"
+        url="https://github.com/loongson/build-tools/releases/download/${{ inputs.version }}/loongarch64-clfs-6.3-cross-tools-gcc-glibc.tar.xz"
         
         wget "$url" -O /tmp/toolchain.tar.xz
         
@@ -38,12 +38,16 @@ runs:
       if: ${{ !steps.restore-cache.outputs.cache-hit }}
       with:
         path: /opt/cross-tools
-        key: loongarch64-${{ matrix.platform.toolchain-version }}
+        key: loongarch64-${{ inputs.version }}
     - name: 'Set output vars'
       id: final
       shell: bash
       run: |
         prefix=/opt/cross-tools
         echo "prefix=${prefix}" >> $GITHUB_OUTPUT
-        echo "cc=${prefix}/bin/loongarch64-unknown-linux-gnu-gcc" >> $GITHUB_OUTPUT
-        echo "cxx=${prefix}/bin/loongarch64-unknown-linux-gnu-g++" >> $GITHUB_OUTPUT
+        cc="${prefix}/bin/loongarch64-unknown-linux-gnu-gcc"
+        cxx="${prefix}/bin/loongarch64-unknown-linux-gnu-g++"
+        echo "cc=${cc}" >> $GITHUB_OUTPUT
+        echo "cxx=${cxx}" >> $GITHUB_OUTPUT
+        echo "LOONGARCH64_CC=${cc}" >>$GITHUB_ENV
+        echo "LOONGARCH64_CXX=${cxx}" >>$GITHUB_ENV
diff --git a/.github/actions/setup-msvc-libusb/action.yml b/.github/actions/setup-msvc-libusb/action.yml
index fbf451af6..cbbf0980b 100644
--- a/.github/actions/setup-msvc-libusb/action.yml
+++ b/.github/actions/setup-msvc-libusb/action.yml
@@ -1,5 +1,5 @@
 name: 'Setup libusb for MSVC'
-description: 'Setup libusb for MSVC'
+description: 'Download libusb sdk for MSVC, and set output/environment variables'
 inputs:
   version:
     description: 'libusb version'
diff --git a/.github/actions/setup-ninja/action.yml b/.github/actions/setup-ninja/action.yml
index bf638eaba..e013c8321 100644
--- a/.github/actions/setup-ninja/action.yml
+++ b/.github/actions/setup-ninja/action.yml
@@ -1,5 +1,5 @@
 name: 'Setup ninja'
-description: 'Setup ninja'
+description: 'Download ninja and add it to the PATH environment variable'
 inputs:
   version:
     description: 'Ninja version'
diff --git a/.github/actions/setup-vita-gles/action.yml b/.github/actions/setup-vita-gles/action.yml
index aa88e69ef..e263737b3 100644
--- a/.github/actions/setup-vita-gles/action.yml
+++ b/.github/actions/setup-vita-gles/action.yml
@@ -1,5 +1,5 @@
 name: 'Setup GLES for PlayStation Vita'
-description: 'Setup GLES (PVR and PIB)'
+description: 'Download GLES for VITA (PVR or PIB), and copy it into the vita sdk'
 inputs:
   pib-version:
     description: 'PIB version'
@@ -18,7 +18,7 @@ runs:
       shell: sh
       run: |
         if test "x${VITASDK}" = "x"; then
-          echo "VITASKD must be defined"
+          echo "VITASDK must be defined"
           exit 1;
         fi
         case "x${{ inputs.type }}" in
diff --git a/.github/workflows/generic.yml b/.github/workflows/generic.yml
index 44560a668..58d7e8ef1 100644
--- a/.github/workflows/generic.yml
+++ b/.github/workflows/generic.yml
@@ -72,15 +72,6 @@ jobs:
         uses: ./.github/actions/setup-loongarch64-toolchain
         id: setup-loongarch64-toolchain
         if: ${{ matrix.platform.platform == 'loongarch64' }}
-        with:
-          version: '2022.09.0'
-      - name: 'Configure LoongArch64 variables'
-        if: ${{ matrix.platform.platform == 'loongarch64' }}
-        shell: sh
-        run: |
-          # We cannot use GitHub expressions in the controller job
-          echo "LOONGARCH64_CC=${{ steps.setup-loongarch64-toolchain.outputs.cc }}" >>$GITHUB_ENV
-          echo "LOONGARCH64_CXX=${{ steps.setup-loongarch64-toolchain.outputs.cxx }}" >>$GITHUB_ENV
       - name: 'Setup Intel oneAPI toolchain'
         id: intel
         if: ${{ matrix.platform.intel }}