Skip to content

Commit 51eefe3

Browse files
committed
Cleanup and fix actions.
1 parent 1007769 commit 51eefe3

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/make.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
env: "env:"
4040
exe: .exe
4141
nul: nul
42+
ldflags: LDFLAGS="-static-libgcc -static-libstdc++ -static"
4243
- runs-on: ubuntu
4344
fasmg: /fasmg.x64
4445
runs-on: ${{matrix.runs-on}}-latest
@@ -104,13 +105,9 @@ jobs:
104105
- name: Build CEmu
105106
run: make -j4 -C ${{env.CEMU_PATH}}/core
106107
- name: Build Autotester CLI
107-
run: make -j4 -C ${{github.workspace}}/CEmu/tests/autotester
108-
- name: Move Autotester CLI
109-
if: runner.os == 'Windows'
110-
run: move ${{github.workspace}}/CEmu/tests/autotester/autotester.exe ${{env.CEDEV_BIN}}/cemu-autotester.exe
111-
- name: Move Autotester CLI
112-
if: runner.os != 'Windows'
113-
run: mv ${{github.workspace}}/CEmu/tests/autotester/autotester ${{env.CEDEV_BIN}}/cemu-autotester
108+
run: make -j4 -C ${{env.CEMU_PATH}}/tests/autotester ${{matrix.ldflags}}
109+
- name: Install Autotester CLI
110+
run: cmake -E copy ${{env.CEMU_PATH}}/tests/autotester/autotester${{matrix.exe}} ${{env.CEDEV_BIN}}/cemu-autotester${{matrix.exe}}
114111

115112
- name: Make Binaries Executable
116113
if: runner.os != 'Windows'

.gitmodules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[submodule "tools/convbin"]
88
path = tools/convbin
99
url = https://github.com/mateoconlechuga/convbin.git
10+
ignore = dirty
1011
[submodule "tools/convimg"]
1112
path = tools/convimg
1213
url = https://github.com/mateoconlechuga/convimg.git

0 commit comments

Comments
 (0)