Skip to content

Commit 75cb002

Browse files
BJNFNEBJNFNE
committed
refactor CI
1 parent 2eb72fe commit 75cb002

7 files changed

Lines changed: 84 additions & 213 deletions

File tree

‎.github/workflows/linux-cmake.yml‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,16 @@ jobs:
3232
- name: Compile all C++ programs
3333
run: make cmake
3434

35-
- name: Compile IMGConverter
36-
run: pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
37-
38-
- name: Compile AdultCornerDecoder
39-
run: pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
40-
41-
- name: Compile AdultCornerEncoder
42-
run: pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
43-
44-
- name: Compile IMGIdentifier
45-
run: pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.py
46-
47-
- name: Compile OBCEditor
48-
run: pyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
49-
50-
- name: Compile PetiteDetector
51-
run: pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
52-
53-
- name: Compile PKLiteDetector
54-
run: pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
55-
56-
- name: Compile SecuROMDetector
57-
run: pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
58-
59-
- name: Compile copyDatas
60-
run: pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
35+
- name: Compile all Python tools
36+
run: |
37+
pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
38+
pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
39+
pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
40+
pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.pypyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
41+
pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
42+
pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
43+
pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
44+
pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
6145
6246
- name: Upload Artifacts
6347
uses: actions/upload-artifact@v4

‎.github/workflows/linux-debug.yml‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,16 @@ jobs:
3232
- name: Compile all C++ programs (Debug)
3333
run: make debug
3434

35-
- name: Compile IMGConverter
36-
run: pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
37-
38-
- name: Compile AdultCornerDecoder
39-
run: pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
40-
41-
- name: Compile AdultCornerEncoder
42-
run: pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
43-
44-
- name: Compile IMGIdentifier
45-
run: pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.py
46-
47-
- name: Compile OBCEditor
48-
run: pyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
49-
50-
- name: Compile PetiteDetector
51-
run: pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
52-
53-
- name: Compile PKLiteDetector
54-
run: pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
55-
56-
- name: Compile SecuROMDetector
57-
run: pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
58-
59-
- name: Compile copyDatas
60-
run: pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
35+
- name: Compile all Python tools
36+
run: |
37+
pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
38+
pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
39+
pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
40+
pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.pypyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
41+
pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
42+
pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
43+
pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
44+
pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
6145
6246
- name: Upload Artifacts
6347
uses: actions/upload-artifact@v4

‎.github/workflows/linux-tools.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,13 @@ jobs:
2626
- name: Run configure
2727
run: ./configure
2828

29-
- name: Compile create_iso
30-
run: g++ -o create_iso common-tools/linux/create_iso/create_iso.cpp
31-
32-
- name: Compile extract_iso
33-
run: g++ -o extract_iso common-tools/linux/extract_iso/extract_iso.cpp -larchive
34-
35-
- name: Compile convert_bin
36-
run: g++ -o convert_bin common-tools/nowin/convert_bin/convert_bin.cpp
37-
38-
- name: Compile create_tar
39-
run: g++ -o create_tar common-tools/nowin/create_tar/create_tar.cpp
40-
41-
- name: Compile create_zip
42-
run: g++ -o create_zip common-tools/nowin/create_zip/create_zip.cpp
29+
- name: Compile Linux tools
30+
run: |
31+
g++ -o create_iso common-tools/linux/create_iso/create_iso.cpp
32+
g++ -o extract_iso common-tools/linux/extract_iso/extract_iso.cpp -larchive
33+
g++ -o convert_bin common-tools/nowin/convert_bin/convert_bin.cpp
34+
g++ -o create_tar common-tools/nowin/create_tar/create_tar.cpp
35+
g++ -o create_zip common-tools/nowin/create_zip/create_zip.cpp
4336
4437
- name: Upload Artifacts
4538
uses: actions/upload-artifact@v4

‎.github/workflows/linux.yml‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,16 @@ jobs:
3232
- name: Compile all C++ programs
3333
run: make -j4
3434

35-
- name: Compile IMGConverter
36-
run: pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
37-
38-
- name: Compile AdultCornerDecoder
39-
run: pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
40-
41-
- name: Compile AdultCornerEncoder
42-
run: pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
43-
44-
- name: Compile IMGIdentifier
45-
run: pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.py
46-
47-
- name: Compile OBCEditor
48-
run: pyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
49-
50-
- name: Compile PetiteDetector
51-
run: pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
52-
53-
- name: Compile PKLiteDetector
54-
run: pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
55-
56-
- name: Compile SecuROMDetector
57-
run: pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
58-
59-
- name: Compile copyDatas
60-
run: pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
35+
- name: Compile all Python tools
36+
run: |
37+
pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
38+
pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
39+
pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
40+
pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.pypyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
41+
pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
42+
pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
43+
pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
44+
pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
6145
6246
- name: Upload Artifacts
6347
uses: actions/upload-artifact@v4

‎.github/workflows/macos.yml‎

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,17 @@ jobs:
2727

2828
- name: Compile all C++ programs
2929
run: make cmake
30-
31-
- name: Compile IMGConverter
32-
run: pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
33-
34-
- name: Compile AdultCornerDecoder
35-
run: pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
36-
37-
- name: Compile AdultCornerEncoder
38-
run: pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
39-
40-
- name: Compile IMGIdentifier
41-
run: pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.py
42-
43-
- name: Compile OBCEditor
44-
run: pyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
45-
46-
- name: Compile PetiteDetector
47-
run: pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
48-
49-
- name: Compile PKLiteDetector
50-
run: pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
51-
52-
- name: Compile SecuROMDetector
53-
run: pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
54-
55-
- name: Compile copyDatas
56-
run: pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
30+
31+
- name: Compile all Python tools
32+
run: |
33+
pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
34+
pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
35+
pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
36+
pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.pypyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
37+
pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
38+
pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
39+
pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
40+
pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
5741
5842
- name: Upload Artifacts
5943
uses: actions/upload-artifact@v4

‎.github/workflows/windows-cmake.yml‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,16 @@ jobs:
2727
- name: Build with CMake
2828
run: cmake --build build --config Release
2929

30-
- name: Compile IMGConverter
31-
run: pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
32-
33-
- name: Compile AdultCornerDecoder
34-
run: pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
35-
36-
- name: Compile AdultCornerEncoder
37-
run: pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
38-
39-
- name: Compile IMGIdentifier
40-
run: pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.py
41-
42-
- name: Compile OBCEditor
43-
run: pyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
44-
45-
- name: Compile PetiteDetector
46-
run: pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
47-
48-
- name: Compile PKLiteDetector
49-
run: pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
50-
51-
- name: Compile SecuROMDetector
52-
run: pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
53-
54-
- name: Compile copyDatas
55-
run: pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
30+
- name: Compile all Python tools
31+
run: |
32+
pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
33+
pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
34+
pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
35+
pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.pypyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
36+
pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
37+
pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
38+
pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
39+
pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
5640
5741
- name: Upload Artifacts
5842
uses: actions/upload-artifact@v4

‎.github/workflows/windows.yml‎

Lines changed: 26 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -24,74 +24,32 @@ jobs:
2424
- name: Install PyInstaller
2525
run: pip install pyinstaller
2626

27-
- name: Compile LoaderMDO
28-
run: g++ -static -mwindows -o LoaderMDO.exe rewritten-modern-software/LoaderMDO/LoaderMDO/LoaderMDO.cpp
29-
30-
- name: Compile BCD1Creator
31-
run: g++ -I. -static -o BCD1Creator.exe tools/BCD1Creator/BCD1Creator.cpp
32-
33-
- name: Compile DEV7Launcher
34-
run: g++ -I. -static -o DEV7Launcher.exe tools/DEV7Launcher/DEV7Launcher.cpp
35-
36-
- name: Compile OBJDumper
37-
run: g++ -static -o OBJDumper.exe tools/OBJDumper/OBJDumper.cpp
38-
39-
- name: Compile ModelPathDumper
40-
run: g++ -I. -static -o ModelPathDumper.exe tools/ModelPathDumper/ModelPathDumper.cpp
41-
42-
- name: Compile SYSTEM (Modern Version)
43-
run: g++ -static -mwindows -o SYSTEM.EXE rewritten-modern-software/SYSTEM/SYSTEM/SYSTEM.cpp
44-
45-
- name: Compile SYSTEM (Modern Russian Version)
46-
run: g++ -static -mwindows -o SYSTEM_RussianRelease.EXE rewritten-modern-software/SYSTEM_RussianRelease/SYSTEM/SYSTEM.cpp
47-
48-
- name: Compile CTRKViewer
49-
run: g++ -I. -static -o CTRKViewer.exe tools/CTRKViewer/CTRKViewer.cpp
50-
51-
- name: Compile OBCViewer
52-
run: g++ -I. -static -o OBCViewer.exe tools/OBCViewer/OBCViewer.cpp
53-
54-
- name: Compile PLAViewer
55-
run: g++ -I. -static -o PLAViewer.exe tools/PLAViewer/PLAViewer.cpp
56-
57-
# - name: Compile DEV7Monitor
58-
# run: g++ -I. -static -o DEV7Monitor.exe tools-win/DEV7Monitor/DEV7Monitor/DEV7Monitor.cpp -lpdh
59-
60-
- name: Compile SetupPatcher
61-
run: g++ -static -o SetupPatcher.exe patches/SetupPatcher/SetupPatcher/SetupPatcher.cpp
62-
63-
- name: Compile Y2K38Patcher
64-
run: g++ -static -o Y2K38Patcher.exe patches/Y2K38Patcher/Y2K38Patcher/Y2K38Patcher.cpp
65-
66-
- name: Compile LOADER7VC
67-
run: g++ -I. -static -o LOADER7VC.exe tools-win/LOADER7VC/LOADER7VC/LOADER7VC.cpp -lversion -lshlwapi
68-
69-
- name: Compile IMGConverter
70-
run: pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
71-
72-
- name: Compile AdultCornerDecoder
73-
run: pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
74-
75-
- name: Compile AdultCornerEncoder
76-
run: pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
77-
78-
- name: Compile IMGIdentifier
79-
run: pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.py
80-
81-
- name: Compile OBCEditor
82-
run: pyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
83-
84-
- name: Compile PetiteDetector
85-
run: pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
86-
87-
- name: Compile PKLiteDetector
88-
run: pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
89-
90-
- name: Compile SecuROMDetector
91-
run: pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
92-
93-
- name: Compile copyDatas
94-
run: pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
27+
- name: Compile C++ programs with MinGW
28+
run: |
29+
g++ -static -mwindows -o LoaderMDO.exe rewritten-modern-software/LoaderMDO/LoaderMDO/LoaderMDO.cpp
30+
g++ -I. -static -o BCD1Creator.exe tools/BCD1Creator/BCD1Creator.cpp
31+
g++ -I. -static -o DEV7Launcher.exe tools/DEV7Launcher/DEV7Launcher.cpp
32+
g++ -static -o OBJDumper.exe tools/OBJDumper/OBJDumper.cpp
33+
g++ -I. -static -o ModelPathDumper.exe tools/ModelPathDumper/ModelPathDumper.cpp
34+
g++ -static -mwindows -o SYSTEM.EXE rewritten-modern-software/SYSTEM/SYSTEM/SYSTEM.cpp
35+
g++ -static -mwindows -o SYSTEM_RussianRelease.EXE rewritten-modern-software/SYSTEM_RussianRelease/SYSTEM/SYSTEM.cpp
36+
g++ -I. -static -o CTRKViewer.exe tools/CTRKViewer/CTRKViewer.cpp
37+
g++ -I. -static -o OBCViewer.exe tools/OBCViewer/OBCViewer.cpp
38+
g++ -I. -static -o PLAViewer.exe tools/PLAViewer/PLAViewer.cpp
39+
g++ -static -o SetupPatcher.exe patches/SetupPatcher/SetupPatcher/SetupPatcher.cpp
40+
g++ -static -o Y2K38Patcher.exe patches/Y2K38Patcher/Y2K38Patcher/Y2K38Patcher.cpp
41+
g++ -I. -static -o LOADER7VC.exe tools-win/LOADER7VC/LOADER7VC/LOADER7VC.cpp -lversion -lshlwapi
42+
43+
- name: Compile all Python tools
44+
run: |
45+
pyinstaller --onefile --distpath . tools/IMGConverter/IMGConverter.py
46+
pyinstaller --onefile --distpath . tools/AdultCornerDecoder/decoder.py
47+
pyinstaller --onefile --distpath . tools/AdultCornerEncoder/encoder.py
48+
pyinstaller --onefile --distpath . tools/IMGIdentifier/IMGIdentifier.pypyinstaller --onefile --distpath . tools/OBCEditor/OBCEditor.py
49+
pyinstaller --onefile --distpath . tools/PetiteDetector/PetiteDetector.py
50+
pyinstaller --onefile --distpath . tools/PKLiteDetector/PKLiteDetector.py
51+
pyinstaller --onefile --distpath . tools/SecuROMDetector/SecuROMDetector.py
52+
pyinstaller --onefile --distpath . tools/copyDatas/copyDatas.py
9553
9654
- name: Upload Artifacts
9755
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)