Skip to content

Commit 38ded87

Browse files
authored
Fix bad merging (truckersmp-cli#179)
1 parent 9e66a2e commit 38ded87

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Diff for: .github/workflows/build_and_upload_inject_program.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Build truckersmp-cli.exe
3030
# we need "make clean" because we already have truckersmp-cli.exe
3131
# and "make" does nothing even when truckersmp-cli.c is changed
32-
run: make clean && make truckersmp_cli/truckersmp-cli.exe
32+
run: make clean && make
3333
- name: Strip truckersmp-cli.exe
3434
run: x86_64-w64-mingw32-strip truckersmp_cli/truckersmp-cli.exe
3535
- uses: actions/upload-artifact@v1

Diff for: truckersmp_cli/args.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,7 @@ def create_arg_parser():
311311
default="-nointro -64bit",
312312
help="""specify ATS/ETS2 options
313313
Note: If specifying one option, use "--game-options=-option" format
314-
[Default: "-nointro -64bit"]""",
315-
action="store_true"))
314+
[Default: "-nointro -64bit"]"""))
316315
store_actions.append(parser.add_argument(
317316
"--native-steam-dir", metavar="DIR", type=str,
318317
default="auto",

0 commit comments

Comments
 (0)