Skip to content

Commit cac1d2c

Browse files
jharajeev55kaur-mananjeetesarver
authored
Adding support for Trebuchet mainframe and modules (#27)
Adding support for Trebuchet mainframe and modules --------- Co-authored-by: kaur-mananjeet <mananjeet.kaur@tektronix.com> Co-authored-by: esarver <esarver@users.noreply.github.com>
1 parent 1bc1810 commit cac1d2c

17 files changed

+3558
-811
lines changed

.github/workflows/pr.yml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ jobs:
6464
- name: Setup dotnet
6565
uses: actions/setup-dotnet@v4
6666

67+
- name: Install mono
68+
run: |
69+
sudo apt-get update
70+
sudo apt-get install -y mono-complete
71+
6772
- name: Restore dependencies
6873
run: |
6974
cd Json_parser
@@ -218,6 +223,37 @@ jobs:
218223
name: keithley_instrument_libraries
219224
path: keithley_instrument_libraries/
220225

226+
- name: Get RC Version
227+
run: |
228+
COMMIT="${{github.sha}}"
229+
if ${{contains(github.head_ref, 'release/')}}; then
230+
V="${{github.head_ref}}"
231+
V="${V#release/}"
232+
else
233+
V="$(npm pkg get version)"
234+
echo "Extracted Version: $V"
235+
V="$(echo v"$V" | sed 's/\"//g')"
236+
echo "Cleaned up Version: $V"
237+
fi
238+
239+
# Check to see if the version tag already exists
240+
# If it does, print a message and exit with an error code
241+
if [ $(git tag --list "$V") ]; then
242+
echo "Version tag already exists. Did you bump the version number?"
243+
exit 1
244+
fi
245+
246+
# Create an RC release if
247+
# 1) This PR is a release branch that hasn't been merged to main.
248+
# 2) This is a feature branch being merged into the main branch.
249+
if ${{(! github.event.pull_request.merged && contains(github.head_ref, 'release/')) || (github.event.pull_request.merged && !contains(github.head_ref, 'release/'))}}; then
250+
V="${V}-$(git tag --list ${V}* | wc -l)"
251+
echo "RC Version: $V"
252+
fi
253+
254+
echo "version=${V}" >> $GITHUB_OUTPUT
255+
npm version --no-git-tag-version "${V}" || true
256+
221257
- name: npm Package
222258
run: npm pack
223259

@@ -226,7 +262,7 @@ jobs:
226262
npm publish *.tgz
227263
env:
228264
NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
229-
265+
230266
release:
231267
name: Release
232268
runs-on: ubuntu-latest
@@ -237,6 +273,7 @@ jobs:
237273
needs:
238274
- webhelp-to-json
239275
- json-to-lua
276+
- publish
240277
if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) || github.event.pull_request.merged ) }}
241278
steps:
242279
- name: Checkout

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
1616
Security -- in case of vulnerabilities.
1717
-->
1818

19+
## [0.19.0]
20+
21+
### Added
22+
- new module support infrastructure
23+
- MP5103, MSMU60-2 and MPSU50-2ST command defination has been added
24+
1925
## [0.18.4]
2026

2127
### Added
@@ -62,7 +68,8 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
6268
- workflow has been added for generaing json artifacts.
6369

6470
<!--Version Comparison Links-->
65-
[Unreleased]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/compare/v0.18.4...HEAD
71+
[Unreleased]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/compare/v0.19.0...HEAD
72+
[0.19.0]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.19.0
6673
[0.18.4]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.18.4
6774
[0.18.3]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.18.3
6875
[0.18.2]: https://github.com/tektronix/tsp-toolkit-webhelp-to-json/releases/tag/v0.18.2

Configuration.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ class Configuration:
2424
"2600B",
2525
"2651A",
2626
"2657A",
27-
"2601B-PULSE"
27+
"2601B-PULSE",
28+
"MP5103",
29+
"MSMU60-2",
30+
"MPSU50-2ST"
2831
]
2932

3033
MODEL_2600B_MODELS = [
@@ -51,5 +54,7 @@ class Configuration:
5154

5255
"2651A":["a"],
5356
"2657A":["a"],
54-
"2601B-PULSE": ["a"]
57+
"2601B-PULSE": ["a"],
58+
"MSMU60-2":["1", "2"],
59+
"MPSU50-2ST":["1", "2"]
5560
}

0 commit comments

Comments
 (0)