Skip to content

CI improvements 20251029 #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjtrujy merged 2 commits into from
Nov 1, 2025
Merged

CI improvements 20251029 #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
204a155
CI: use macos-15-intel
uyjulian Oct 29, 2025
af398e1
CI: if multi-threaded build fails, try single threaded
uyjulian Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/compilation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ jobs:
- name: Compile project ${{ matrix.debug }}
run: |
make -j $(getconf _NPROCESSORS_ONLN) clean
make -j $(getconf _NPROCESSORS_ONLN) ${{ matrix.debug }}
make -j $(getconf _NPROCESSORS_ONLN) ${{ matrix.debug }} || make clean
Copy link
Member

@fjtrujy fjtrujy Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you changing that line?

Copy link
Member Author

@uyjulian uyjulian Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the multi-threaded build fails, it will cleanup.
If it succeeds, it won't run make clean and the next line will proceed normally.
This is the same logic as done here: https://github.com/ps2dev/ps2dev/blob/28fdcbdde0c773569a3f09f2a95c61ab62f6fb94/scripts/002-ps2sdk.sh#L43

make -j ${{ matrix.debug }}
make -j $(getconf _NPROCESSORS_ONLN) install
# Create symbolink links using relative paths
(cd $PS2DEV/ee/mips64r5900el-ps2-elf/lib && ln -sf ../../../ps2sdk/ee/lib/libcglue.a libcglue.a && cd -)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
os: [
[macos-latest, arm64, bash],
[macos-13, x86_64, bash],
[macos-15-intel, x86_64, bash],
[ubuntu-latest, x86_64, bash],
[windows-latest, x86_64, msys2]
]
Expand Down