ci: update actions descriptions + fix loongarch64 action

[sdl-ci-filter *loongarch64*]
This commit is contained in:
Anonymous Maarten 2024-07-28 13:33:14 +02:00
parent 3b01a0b884
commit 446c05a001
5 changed files with 15 additions and 20 deletions

View File

@ -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

View File

@ -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'

View File

@ -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'

View File

@ -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

View File

@ -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 }}