Skip to content

Commit 26256f0

Browse files
committedJun 20, 2021
Fixed debug builds
1 parent 68797a5 commit 26256f0

File tree

3 files changed

+45
-17
lines changed

3 files changed

+45
-17
lines changed
 

‎.github/workflows/check-format.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ jobs:
1010
steps:
1111
- name: Install dependencies
1212
shell: bash
13-
run: |
14-
sudo apt-get install git make clang-format
13+
run: sudo apt-get install git make clang-format
1514

1615
- uses: actions/checkout@v2
1716

‎.github/workflows/compilation.yml

+43-15
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ jobs:
1717
1818
- name: git checkout
1919
uses: actions/checkout@v2
20-
- run: |
21-
git fetch --prune --unshallow
20+
21+
- run: git fetch --prune --unshallow
2222

2323
- name: Compile -> make clean release
24-
run: |
25-
make --trace clean release
24+
run: make --trace clean release
2625

2726
- name: Create detailed changelog
2827
run: sh ./make_changelog.sh
@@ -47,23 +46,23 @@ jobs:
4746
README.md
4847
4948
build-variants:
50-
runs-on: ubuntu-latest
51-
container: ps2dev/ps2dev:latest
5249
strategy:
50+
fail-fast: false
5351
matrix:
5452
rtl: ["", RTL=1]
5553
pademu: ["", PADEMU=1]
5654
igs: ["", IGS=1]
5755
t10k: ["", DTL_T10000=1]
56+
runs-on: ubuntu-latest
57+
container: ps2dev/ps2dev:latest
5858
steps:
5959
- name: Install dependencies
60-
run: |
61-
apk add build-base git
60+
run: apk add build-base git zip gawk
6261

6362
- name: git checkout
6463
uses: actions/checkout@v2
65-
- run: |
66-
git fetch --prune --unshallow
64+
65+
- run: git fetch --prune --unshallow
6766

6867
- name: Get version
6968
id: version
@@ -78,12 +77,41 @@ jobs:
7877
run: sh ./make_changelog.sh
7978

8079
- name: Upload variants artifact ELF
81-
if: ${{ success() }}
8280
uses: actions/upload-artifact@v2
8381
with:
8482
name: OPNPS2LD-VARIANTS
85-
path: |
86-
OPNPS2LD*.ELF
83+
path: OPNPS2LD*.ELF
84+
85+
build-debug:
86+
strategy:
87+
fail-fast: false
88+
matrix:
89+
debug: [debug, iopcore_debug, ingame_debug, deci2_debug] # eesio_debug broken
90+
runs-on: ubuntu-latest
91+
container: ps2dev/ps2dev:latest
92+
steps:
93+
- name: Install dependencies
94+
run: apk add build-base git zip gawk
95+
96+
- name: git checkout
97+
uses: actions/checkout@v2
98+
99+
- run: git fetch --prune --unshallow
100+
101+
- name: Get version
102+
id: version
103+
run: echo "::set-output name=version::$(make oplversion)"
104+
105+
- name: Compile -> make debug
106+
run: |
107+
make ${{ matrix.debug }} --trace
108+
mv opl.elf opl-${{ matrix.debug }}.elf
109+
110+
- name: Upload variants artifact ELF
111+
uses: actions/upload-artifact@v2
112+
with:
113+
name: opl-debug-${{ steps.version.outputs.version }}-${{ matrix.docker }}
114+
path: opl-*.elf
87115

88116
release:
89117
needs: [build, build-variants]
@@ -92,8 +120,8 @@ jobs:
92120
steps:
93121
- name: git checkout
94122
uses: actions/checkout@v2
95-
- run: |
96-
git fetch --prune --unshallow
123+
124+
- run: git fetch --prune --unshallow
97125

98126
- name: Get version
99127
id: version

‎modules/debug/udptty-ingame/imports.lst

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
thsemap_IMPORTS_start
2+
I_CreateSema
23
I_DeleteSema
34
I_SignalSema
45
I_WaitSema

0 commit comments

Comments
 (0)