Skip to content

Commit 312b8ce

Browse files
authored
Merge pull request #667 from monkeyman192/linux_fix
Fix linux tests running on CI
2 parents 010e73e + a108517 commit 312b8ce

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.github/workflows/pipeline.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ jobs:
2525
dotnet: [{framework: 'net6.0', version: '6.0.0'}, {framework: 'net7.0', version: '7.0.0'}]
2626
steps:
2727
- uses: actions/checkout@v4
28+
- uses: actions/setup-dotnet@v5
29+
with:
30+
# Install both sdk versions.
31+
dotnet-version: |
32+
6.0.100
33+
7.0.100
2834
- name: Build ${{ matrix.os.name }}-dotnet ${{ matrix.dotnet }} binaries
2935
run: |
3036
sed -i '\|<TargetFrameworks>net6.0;net7.0</TargetFrameworks>|a\ <RuntimeFrameworkVersion>${{ matrix.dotnet.version }}</RuntimeFrameworkVersion>' ./MBINCompiler/MBINCompiler.csproj

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ MBINCompiler has a number of arguments that can be called from the command line
7070

7171
There are also a number of other options that can be passed to the executable in most modes. To see all the details call `MBINCompiler.exe help` to see the help details.
7272

73+
### Running on linux
74+
75+
MBINCompiler provides pre-built binaries for linux. These do not require mono to be run but will require the dotnet framework to be installed on your system.
76+
77+
To run the binary simply call it directly (eg. `MBINCompiler ./path/to/file.MBIN`) and this will convert the provided file.
78+
See above for any extra command line arguments.
79+
7380
## SUBMITTING BUG REPORTS
7481

7582
If you run into errors, in most cases the errors are because:
@@ -112,7 +119,7 @@ For anyone helping to develop MBINCompiler, if you are contributing new structs
112119

113120
### Requirements
114121

115-
To run the tests you will need python installed and on the path. It is recommended you get a recent version (3.7 or above).
122+
To run the tests you will need python installed and on the path. It is recommended you get a recent version (3.9 or above).
116123
The required dependencies are `pytest` and `requests`. These can be installed by entering `python -m pip install -U pytest requests` in your favorite command line program.
117124
Before running the tests, you need to have built a `Release` version of MBINCompiler locally.
118125

conftest.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,7 @@ def convert_files():
9393
if not op.exists(mbincompiler_path):
9494
pytest.fail(f"MBINCompiler can't be found at the following path: {mbincompiler_path}", False)
9595

96-
if platform == 'linux-x64':
97-
# need to run with mono on linux
98-
# Build path also includes platform on the CI
99-
cmd = ['sudo', 'mono', mbincompiler_path, '-q', '-y']
100-
else:
101-
cmd = [mbincompiler_path, '-q', '-y']
102-
cmd.append('--force')
96+
cmd = [mbincompiler_path, '-q', '-y', '--force']
10397

10498
datapath = os.environ.get('datapath', DATA_PATH)
10599

0 commit comments

Comments
 (0)