Skip to content

Commit 22a35e1

Browse files
committed
Library Updates
- Update actions, dockerfile, some submodules - Clarify some yaml error messages
1 parent 6f1e6dd commit 22a35e1

10 files changed

Lines changed: 20 additions & 20 deletions

File tree

.github/workflows/build_mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout Repository
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v6
4040
with:
4141
submodules: recursive
4242

@@ -89,7 +89,7 @@ jobs:
8989
echo "RANDO_VERSION=$(((Get-Content version.hpp | Select-String -Pattern '#define RANDOMIZER_VERSION "[0-9\.\-a-z]*"') -Replace '.*("[0-9\.\-a-z]*").*', '$1') -Replace '"', '')" >> $env:GITHUB_OUTPUT
9090
9191
- name: Save Artifact
92-
uses: actions/upload-artifact@v4
92+
uses: actions/upload-artifact@v6
9393
with:
9494
path: ${{github.workspace}}/build/wwhd_rando.dmg
9595
name: wwhd_rando_${{ steps.get-version.outputs.RANDO_VERSION }}_mac.dmg

.github/workflows/build_release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,24 @@ jobs:
3737
steps:
3838
# Will make the later gh release command work
3939
- name: Checkout Repository
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v6
4141

4242
- name: Create Folder for Windows Files
4343
run: mkdir wwhd_rando_${{ github.event.release.tag_name }}_windows
4444

4545
- name: Download Windows Artifact
46-
uses: actions/download-artifact@v4
46+
uses: actions/download-artifact@v7
4747
with:
4848
path: ${{ github.workspace }}/wwhd_rando_${{ github.event.release.tag_name }}_windows
4949
name: wwhd_rando_${{ github.event.release.tag_name }}_windows # pass name so it doesn't get put in a folder
5050

5151
- name: Download Wii U Artifact
52-
uses: actions/download-artifact@v4
52+
uses: actions/download-artifact@v7
5353
with:
5454
name: wwhd_rando_${{ github.event.release.tag_name }}.wuhb # pass name so it doesn't get put in a folder
5555

5656
- name: Download Mac OS Artifact
57-
uses: actions/download-artifact@v4
57+
uses: actions/download-artifact@v7
5858
with:
5959
name: wwhd_rando_${{ github.event.release.tag_name }}_mac.dmg # pass name so it doesn't get put in a folder
6060

.github/workflows/build_wiiu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Checkout Repository
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v6
3939
with:
4040
submodules: recursive
4141

@@ -61,7 +61,7 @@ jobs:
6161
echo "RANDO_VERSION=$(((Get-Content version.hpp | Select-String -Pattern '#define RANDOMIZER_VERSION "[0-9\.\-a-z]*"') -Replace '.*("[0-9\.\-a-z]*").*', '$1') -Replace '"', '')" >> $env:GITHUB_OUTPUT
6262
6363
- name: Save Artifact
64-
uses: actions/upload-artifact@v4
64+
uses: actions/upload-artifact@v6
6565
with:
6666
path: ${{github.workspace}}/build/wwhd_rando.wuhb
6767
name: wwhd_rando_${{ steps.get-version.outputs.RANDO_VERSION }}.wuhb

.github/workflows/build_windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ jobs:
3838
# Increase page size so that the compiler doesn't
3939
# run out of memory
4040
- name: Configure Pagefile
41-
uses: al-cheb/configure-pagefile-action@v1.4
41+
uses: al-cheb/configure-pagefile-action@v1.5
4242
with:
4343
minimum-size: 16GB
4444
maximum-size: 16GB
4545
disk-root: "C:"
4646

4747
- name: Checkout Repository
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v6
4949
with:
5050
submodules: recursive
5151

@@ -100,7 +100,7 @@ jobs:
100100
${{ github.workspace }}\..\Qt\${{ env.QT_VERSION }}\mingw_64\bin\qtenv2.bat && cd ${{ github.workspace }}\build\wwhd_rando_windows && windeployqt wwhd_rando.exe --no-translations --no-system-d3d-compiler --no-opengl-sw
101101
102102
- name: Save Artifact
103-
uses: actions/upload-artifact@v4
103+
uses: actions/upload-artifact@v6
104104
with:
105105
path: ${{github.workspace}}/build/wwhd_rando_windows
106106
name: wwhd_rando_${{ steps.get-version.outputs.RANDO_VERSION }}_windows

.github/workflows/run_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
# Increase page size so that the compiler doesn't
1414
# run out of memory
1515
- name: Configure Pagefile
16-
uses: al-cheb/configure-pagefile-action@v1.4
16+
uses: al-cheb/configure-pagefile-action@v1.5
1717
with:
1818
minimum-size: 16GB
1919
maximum-size: 16GB
2020
disk-root: "C:"
2121

2222
- name: Checkout Repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
with:
2525
submodules: recursive
2626

dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM devkitpro/devkitppc:20250727
1+
FROM devkitpro/devkitppc:20251117
22

33
ENV PATH=$DEVKITPPC/bin:$PATH
44
ENV BUILD_TYPE=randomizer
@@ -19,7 +19,7 @@ RUN pip3 install -r /scripts/requirements.txt
1919
# Install wut
2020
RUN git clone https://github.com/devkitPro/wut wut --single-branch && \
2121
cd wut && \
22-
git checkout 1b412d2769f4a791bfbcf00029a643ba5c5a50fb && \
22+
git checkout e3ac1190372c8087167edefefcbf109e571fc4a2 && \
2323
make -j$(nproc) && \
2424
make install && \
2525
cd .. && \

libs/AES

Submodule AES updated 1 file

libs/tinyxml2

libs/yaml.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
bool LoadYAML(YAML::Node& out, const fspath& path, const bool& resourceFile /* = false */) {
77
std::string file;
88
if(Utility::getFileContents(path, file, resourceFile) != 0) {
9-
ErrorLog::getInstance().log("Unable to open file " + Utility::toUtf8String(path));
9+
ErrorLog::getInstance().log("Unable to get data from " + Utility::toUtf8String(path));
1010
return false;
1111
}
1212

1313
try {
1414
out = YAML::Load(file);
1515
}
1616
catch (const YAML::Exception& ex) {
17-
ErrorLog::getInstance().log(std::string("Error parsing" + Utility::toUtf8String(path) + ": ") + ex.what());
17+
ErrorLog::getInstance().log(std::string("Error parsing yaml " + Utility::toUtf8String(path) + ": ") + ex.what());
1818
return false;
1919
}
2020

0 commit comments

Comments
 (0)