Skip to content

Commit 172276d

Browse files
committed
- Add ARM64 builds to release action
- Update/refresh readme
1 parent bdff439 commit 172276d

File tree

5 files changed

+63
-27
lines changed

5 files changed

+63
-27
lines changed

.github/workflows/release.yml

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,67 @@ jobs:
3636
- name: Publish all and zip artifacts
3737
run: |
3838
dotnet publish --configuration Release --runtime linux-x64 main/ThermoRawFileParser.csproj --sc -o publish/linux-x64
39+
dotnet publish --configuration Release --runtime linux-arm64 main/ThermoRawFileParser.csproj --sc -o publish/linux-arm64
3940
dotnet publish --configuration Release --runtime win-x64 main/ThermoRawFileParser.csproj --sc -o publish/win-x64
41+
dotnet publish --configuration Release --runtime win-arm64 main/ThermoRawFileParser.csproj --sc -o publish/win-arm64
4042
dotnet publish --configuration Release --runtime osx-x64 main/ThermoRawFileParser.csproj --sc -o publish/osx-x64
43+
dotnet publish --configuration Release --runtime osx-arm64 main/ThermoRawFileParser.csproj --sc -o publish/osx-arm64
4144
dotnet publish --configuration Release --framework net8.0 main/ThermoRawFileParser.csproj -o publish/net8
4245
cd publish/linux-x64
43-
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-linux.zip *
46+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-linux-x64.zip *
47+
cd ../linux-arm64
48+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-linux-arm64.zip *
4449
cd ../win-x64
45-
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-win.zip *
50+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-win-x64.zip *
51+
cd ../win-arm64
52+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-win-arm64.zip *
4653
cd ../osx-x64
47-
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-osx.zip *
54+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-osx-x64.zip *
55+
cd ../osx-arm64
56+
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-osx-arm64.zip *
4857
cd ../net8
4958
zip -r -q ThermoRawFileParser-${{ github.ref_name }}-net8.zip *
5059
51-
- name: Upload Linux to release
60+
- name: Upload Linux x64 to release
5261
uses: svenstaro/upload-release-action@v2
5362
with:
5463
repo_token: ${{ secrets.GITHUB_TOKEN }}
55-
file: publish/linux-x64/ThermoRawFileParser-${{ github.ref_name }}-linux.zip
64+
file: publish/linux-x64/ThermoRawFileParser-${{ github.ref_name }}-linux-x64.zip
65+
tag: ${{ github.ref }}
66+
67+
- name: Upload Linux ARM64 to release
68+
uses: svenstaro/upload-release-action@v2
69+
with:
70+
repo_token: ${{ secrets.GITHUB_TOKEN }}
71+
file: publish/linux-arm64/ThermoRawFileParser-${{ github.ref_name }}-linux-arm64.zip
5672
tag: ${{ github.ref }}
5773

58-
- name: Upload OSX to release
74+
- name: Upload OSX x64 to release
5975
uses: svenstaro/upload-release-action@v2
6076
with:
6177
repo_token: ${{ secrets.GITHUB_TOKEN }}
62-
file: publish/osx-x64/ThermoRawFileParser-${{ github.ref_name }}-osx.zip
78+
file: publish/osx-x64/ThermoRawFileParser-${{ github.ref_name }}-osx-x64.zip
79+
tag: ${{ github.ref }}
80+
81+
- name: Upload OSX ARM64 to release
82+
uses: svenstaro/upload-release-action@v2
83+
with:
84+
repo_token: ${{ secrets.GITHUB_TOKEN }}
85+
file: publish/osx-arm64/ThermoRawFileParser-${{ github.ref_name }}-osx-arm64.zip
6386
tag: ${{ github.ref }}
6487

65-
- name: Upload Windows to release
88+
- name: Upload Windows x64 to release
89+
uses: svenstaro/upload-release-action@v2
90+
with:
91+
repo_token: ${{ secrets.GITHUB_TOKEN }}
92+
file: publish/win-x64/ThermoRawFileParser-${{ github.ref_name }}-win-x64.zip
93+
tag: ${{ github.ref }}
94+
95+
- name: Upload Windows ARM64 to release
6696
uses: svenstaro/upload-release-action@v2
6797
with:
6898
repo_token: ${{ secrets.GITHUB_TOKEN }}
69-
file: publish/win-x64/ThermoRawFileParser-${{ github.ref_name }}-win.zip
99+
file: publish/win-arm64/ThermoRawFileParser-${{ github.ref_name }}-win-arm64.zip
70100
tag: ${{ github.ref }}
71101

72102
- name: Upload framework-based to release

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ obj/
66
.vs/
77
*.csproj.user
88
.vscode/
9-
Properties/
9+
Properties/
10+
publish/

README.md

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
A tool allowing reading Thermo RAW mass spectrometer files and converting to common open formats on all platforms supporting .NET Core.
44

5-
Supported formats:
5+
Supported output formats:
66
* MGF
77
* mzML and indexed mzML
88
* Apache Parquet
99

1010
Version before 2.0.0 require Mono to run on Linux and Mac.
1111

12-
As of version 1.2.0, 2 subcommands are available (shoutout to the [eubic 2020 developers meeting](https://eubic-ms.org/events/2020-developers-meeting/), see [usage](#usage) for examples):
12+
The following subcommands (introduced in version 1.2.0 - shoutout to the [eubic 2020 developers meeting](https://eubic-ms.org/events/2020-developers-meeting/)) are available.
1313
* query: returns one or more spectra in JSON PROXI by scan number(s)
1414
* xic: returns chromatogram data based on JSON filter input
1515

16-
RawFileReader reading tool. Copyright © 2016 by Thermo Fisher Scientific, Inc. All rights reserved
16+
This software uses **RawFileReader reading tool Copyright © 2016 by Thermo Fisher Scientific, Inc. All rights reserved**
1717

1818
## ThermoRawFileParser Publication:
1919
* Hulstaert N, Shofstahl J, Sachsenberg T, Walzer M, Barsnes H, Martens L, Perez-Riverol Y: _ThermoRawFileParser: Modular, Scalable, and Cross-Platform RAW File Conversion_ [[PMID 31755270](https://www.ncbi.nlm.nih.gov/pubmed/31755270)].
@@ -22,16 +22,24 @@ RawFileReader reading tool. Copyright © 2016 by Thermo Fisher Scientific, Inc.
2222
## Requirements
2323

2424
### Current version
25-
Release page provide self-contained releases for OSX, Linux, and Windows and framework-based release. Framework-based release requires [.NET 8 runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0/runtime).
25+
Release page provide self-contained releases for OSX, Linux, and Windows (all necessary dependencies included) and framework-based release. Self-contained releases provided for both `x64` and `arm64` architectures. Framework-based release requires [.NET Core 8 runtime, including ASP.NET Core 8](https://dotnet.microsoft.com/en-us/download/dotnet/8.0/runtime).
26+
27+
**NOTE** In some cases **ASP.NET Core** runtime should be installed separately, check for package `aspnet-runtime` (or similar) in your package manager.
28+
29+
On MacOS you need to bypass security quarantine by running the following:
30+
```
31+
> xattr -dr com.apple.quarantine {path_to_ThermoRawFileParser_folder}
32+
> xattr {path_to_ThermoRawFileParser_folder}/*
33+
```
2634

2735
For developers: [.NET 8 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) is required to build the tool.
2836

29-
### Prior to 1.5.0
37+
### Prior to 2.0.0
3038
[Mono](https://www.mono-project.com/download/stable/#download-lin) (install mono-complete if you encounter "assembly not found" errors).
3139

3240
## Download
3341

34-
Click [here](https://github.com/compomics/ThermoRawFileParser/releases) to go to the release page (with [release notes](https://github.com/compomics/ThermoRawFileParser/wiki/ReleaseNotes) starting from v1.1.7).
42+
Click [here](https://github.com/compomics/ThermoRawFileParser/releases) to go to the release page and choose the release relevant for your platform and architecture.
3543

3644
You can find the ThermoRawFileParserGUI [here](https://github.com/compomics/ThermoRawFileParserGUI).
3745

@@ -56,12 +64,12 @@ or
5664
ThermoRawFileParser -d=/home/user/data_input/
5765
```
5866

59-
When running framework-based version use `dotnet ThermoRawFileParser.dll` instead.
67+
**NOTE**: When running framework-based version use `dotnet ThermoRawFileParser.dll` instead of `ThermoRawFileParser`
6068

61-
The optional parameters only work in the -option=value format. The tool can output some RAW file metadata `-m=0|1` (0 for JSON, 1 for TXT) and the spectra file `-f=0|1|2|3|4` (0 for MGF, 1 for mzML, 2 for indexed mzML, 3 for Parquet, 4 for no output) or both. Use the `-p` flag to disable the thermo native peak picking.
69+
The optional parameters only work in the -option=value format. The tool can output some RAW file metadata `-m=0|1` (0 for JSON, 1 for TXT) and the spectra file `-f=0|1|2|3|4` (0 for MGF, 1 for mzML, 2 for indexed mzML, 3 for Parquet, 4 for no output) or both. Use the `-p` flag to disable the peak picking.
6270

6371
```
64-
Usage is ThermoRawFileParser.exe [subcommand] [options]
72+
Usage is ThermoRawFileParser [subcommand] [options]
6573
optional subcommands are xic|query (use [subcommand] -h for more info]):
6674
-h, --help Prints out the options.
6775
-v, --version Prints out the version of the executable.
@@ -142,11 +150,11 @@ A (java) graphical user interface is also available [here](https://github.com/co
142150
Enables the retrieval spectra by (a) scan number(s) in [PROXI format](https://github.com/HUPO-PSI/proxi-schemas).
143151

144152
```
145-
mono ThermoRawFileParser.exe query -i=/home/user/data_input/raw_file.raw -o=/home/user/output.json n="1-5, 20, 25-30"
153+
ThermoRawFileParser query -i=/home/user/data_input/raw_file.raw -o=/home/user/output.json n="1-5, 20, 25-30"
146154
```
147155

148156
```
149-
ThermoRawFileParser.exe query --help
157+
ThermoRawFileParser query --help
150158
usage is:
151159
-h, --help Prints out the options.
152160
-i, --input=VALUE The raw file input (Required).
@@ -170,11 +178,11 @@ usage is:
170178
Return one or more chromatograms based on query JSON input.
171179

172180
```
173-
mono ThermoRawFileParser.exe xic -i=/home/user/data_input/raw_file.raw -j=/home/user/xic_input.json
181+
ThermoRawFileParser xic -i=/home/user/data_input/raw_file.raw -j=/home/user/xic_input.json
174182
```
175183

176184
```
177-
ThermoRawFileParser.exe xic --help
185+
ThermoRawFileParser xic --help
178186
-h, --help Prints out the options.
179187
-i, --input=VALUE The raw file input (Required). Specify this or an
180188
input directory -d
@@ -291,7 +299,7 @@ By default the parser only logs to console. To enable logging to file, uncomment
291299
First check the latest version tag on [biocontainers/thermorawfileparser/tags](https://quay.io/repository/biocontainers/thermorawfileparser?tab=tags). Then pull and run the container with
292300

293301
```bash
294-
docker run -i -t -v /home/user/raw:/data_input quay.io/biocontainers/thermorawfileparser:<tag> ThermoRawFileParser.sh --help
302+
docker run -i -t -v /home/user/raw:/data_input quay.io/biocontainers/thermorawfileparser:<tag> ThermoRawFileParser --help
295303
```
296304

297305
[Go to top of page](#thermorawfileparser)

RawFileReaderLicense.doc

-51.5 KB
Binary file not shown.

ThermoRawFileParser

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)