nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update gh actions, fix cmake whitespace (#6361)

Browse Source
This commit is contained in:
Philip Dubé
2026-03-17 04:54:04 +00:00
committed by GitHub
parent b35883e1f6
commit cefc9c02fa
5 changed files with 204 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/clang-format.yml vendored
View File

@@ -8,7 +8,7 @@ jobs:
clang-format: clang-format:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
with: with:
fetch-depth: 2 fetch-depth: 2
- name: Install clang-format - name: Install clang-format

36
.github/workflows/generate-builds.yml vendored
View File

@@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Git Checkout - name: Git Checkout
uses: actions/checkout@v4 uses: actions/checkout@v6
with: with:
submodules: true submodules: true
- name: Configure ccache - name: Configure ccache
@@ -27,7 +27,7 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y $(cat .github/workflows/apt-deps.txt) libzip-dev zipcmp zipmerge ziptool sudo apt-get install -y $(cat .github/workflows/apt-deps.txt) libzip-dev zipcmp zipmerge ziptool
- name: Restore Cached deps folder - name: Restore Cached deps folder
uses: actions/cache/restore@v4 uses: actions/cache/restore@v5
with: with:
key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }} key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }}
restore-keys: | restore-keys: |
@@ -68,7 +68,7 @@ jobs:
cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
cmake --build build-cmake --config Release --target GenerateSohOtr -j3 cmake --build build-cmake --config Release --target GenerateSohOtr -j3
- name: Upload soh.o2r - name: Upload soh.o2r
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: soh.o2r name: soh.o2r
path: soh.o2r path: soh.o2r
@@ -79,7 +79,7 @@ jobs:
runs-on: macos-14 runs-on: macos-14
steps: steps:
- name: Git Checkout - name: Git Checkout
uses: actions/checkout@v4 uses: actions/checkout@v6
with: with:
submodules: true submodules: true
- name: Configure ccache - name: Configure ccache
@@ -99,7 +99,7 @@ jobs:
sudo chmod +x /opt/homebrew/bin/gtar sudo chmod +x /opt/homebrew/bin/gtar
- name: Restore Cached MacPorts - name: Restore Cached MacPorts
id: restore-cache-macports id: restore-cache-macports
uses: actions/cache/restore@v4 uses: actions/cache/restore@v5
with: with:
key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}-${{ github.sha }} key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}-${{ github.sha }}
restore-keys: | restore-keys: |
@@ -123,7 +123,7 @@ jobs:
sudo port install $(cat .github/workflows/macports-deps.txt) sudo port install $(cat .github/workflows/macports-deps.txt)
brew install ninja brew install ninja
- name: Download soh.o2r - name: Download soh.o2r
uses: actions/download-artifact@v4 uses: actions/download-artifact@v7
with: with:
name: soh.o2r name: soh.o2r
path: build-cmake/soh path: build-cmake/soh
@@ -137,7 +137,7 @@ jobs:
mv _packages/*.dmg SoH.dmg mv _packages/*.dmg SoH.dmg
mv README.md readme.txt mv README.md readme.txt
- name: Upload build - name: Upload build
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: soh-mac name: soh-mac
path: | path: |
@@ -145,7 +145,7 @@ jobs:
readme.txt readme.txt
- name: Save Cache MacPorts - name: Save Cache MacPorts
if: ${{ github.ref_name == github.event.repository.default_branch }} if: ${{ github.ref_name == github.event.repository.default_branch }}
uses: actions/cache/save@v4 uses: actions/cache/save@v5
with: with:
key: ${{ steps.restore-cache-macports.outputs.cache-primary-key }} key: ${{ steps.restore-cache-macports.outputs.cache-primary-key }}
path: /opt/local/ path: /opt/local/
@@ -155,7 +155,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: Git Checkout - name: Git Checkout
uses: actions/checkout@v4 uses: actions/checkout@v6
with: with:
submodules: true submodules: true
- name: Install dependencies - name: Install dependencies
@@ -172,7 +172,7 @@ jobs:
${{ runner.os }}-ccache ${{ runner.os }}-ccache
- name: Restore Cached deps folder - name: Restore Cached deps folder
id: restore-cache-deps id: restore-cache-deps
uses: actions/cache/restore@v4 uses: actions/cache/restore@v5
with: with:
key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }} key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }}
restore-keys: | restore-keys: |
@@ -234,7 +234,7 @@ jobs:
sudo make install sudo make install
sudo cp -av /usr/local/lib/libzip* /lib/x86_64-linux-gnu/ sudo cp -av /usr/local/lib/libzip* /lib/x86_64-linux-gnu/
- name: Download soh.o2r - name: Download soh.o2r
uses: actions/download-artifact@v4 uses: actions/download-artifact@v7
with: with:
name: soh.o2r name: soh.o2r
path: build-cmake/soh path: build-cmake/soh
@@ -251,7 +251,7 @@ jobs:
CC: gcc-12 CC: gcc-12
CXX: g++-12 CXX: g++-12
- name: Upload build - name: Upload build
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: soh-linux name: soh-linux
path: | path: |
@@ -259,7 +259,7 @@ jobs:
readme.txt readme.txt
- name: Save Cache deps folder - name: Save Cache deps folder
if: ${{ github.ref_name == github.event.repository.default_branch }} if: ${{ github.ref_name == github.event.repository.default_branch }}
uses: actions/cache/save@v4 uses: actions/cache/save@v5
with: with:
key: ${{ steps.restore-cache-deps.outputs.cache-primary-key }} key: ${{ steps.restore-cache-deps.outputs.cache-primary-key }}
path: deps path: deps
@@ -273,7 +273,7 @@ jobs:
choco install ninja -y choco install ninja -y
Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue Remove-Item -Path "C:\ProgramData\Chocolatey\bin\ccache.exe" -Force -ErrorAction SilentlyContinue
- name: Git Checkout - name: Git Checkout
uses: actions/checkout@v4 uses: actions/checkout@v6
with: with:
submodules: true submodules: true
- name: Configure sccache - name: Configure sccache
@@ -289,7 +289,7 @@ jobs:
${{ runner.os }}-ccache ${{ runner.os }}-ccache
- name: Restore Cached VCPKG folder - name: Restore Cached VCPKG folder
id: restore-cache-vcpkg id: restore-cache-vcpkg
uses: actions/cache/restore@v4 uses: actions/cache/restore@v5
with: with:
key: ${{ runner.os }}-vcpkg-${{ github.ref }}-${{ github.sha }} key: ${{ runner.os }}-vcpkg-${{ github.ref }}-${{ github.sha }}
restore-keys: | restore-keys: |
@@ -299,7 +299,7 @@ jobs:
- name: Configure Developer Command Prompt - name: Configure Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1
- name: Download soh.o2r - name: Download soh.o2r
uses: actions/download-artifact@v4 uses: actions/download-artifact@v7
with: with:
name: soh.o2r name: soh.o2r
path: build-windows/soh path: build-windows/soh
@@ -317,13 +317,13 @@ jobs:
- name: Unzip package - name: Unzip package
run: Expand-Archive -Path _packages/soh-windows.zip -DestinationPath soh-windows run: Expand-Archive -Path _packages/soh-windows.zip -DestinationPath soh-windows
- name: Upload build - name: Upload build
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v7
with: with:
name: soh-windows name: soh-windows
path: soh-windows path: soh-windows
- name: Save Cache VCPKG folder - name: Save Cache VCPKG folder
if: ${{ github.ref_name == github.event.repository.default_branch }} if: ${{ github.ref_name == github.event.repository.default_branch }}
uses: actions/cache/save@v4 uses: actions/cache/save@v5
with: with:
key: ${{ steps.restore-cache-vcpkg.outputs.cache-primary-key }} key: ${{ steps.restore-cache-vcpkg.outputs.cache-primary-key }}
path: vcpkg path: vcpkg

4
.github/workflows/pr-artifacts.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
if: ${{ github.event.workflow_run.event == 'pull_request' }} if: ${{ github.event.workflow_run.event == 'pull_request' }}
steps: steps:
- id: 'pr-number' - id: 'pr-number'
uses: actions/github-script@v7 uses: actions/github-script@v8
with: with:
result-encoding: string result-encoding: string
script: | script: |
@@ -37,7 +37,7 @@ jobs:
return prNumber; return prNumber;
- id: 'artifacts-text' - id: 'artifacts-text'
uses: actions/github-script@v7 uses: actions/github-script@v8
with: with:
result-encoding: string result-encoding: string
script: | script: |

2
.github/workflows/test-builds-on-distros.yml vendored
View File

@@ -59,7 +59,7 @@ jobs:
cmake .. cmake ..
make make
sudo make install sudo make install
- uses: actions/checkout@v4 - uses: actions/checkout@v6
with: with:
submodules: true submodules: true
- name: Build SoH - name: Build SoH

1
soh/CMakeLists.txt
View File

@@ -693,7 +693,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "CafeOS")
else() else()
find_package(SDL2) find_package(SDL2)
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(Ogg REQUIRED) find_package(Ogg REQUIRED)
find_package(Vorbis REQUIRED) find_package(Vorbis REQUIRED)