Skip to content

Commit c6ae5d5

Browse files
authored
Tsp 975 adding support for mp5103 (#12)
Adding webhelp manuals for new models (MP5103, MPSU50-2ST and MSMU60-2)
1 parent 5c14281 commit c6ae5d5

File tree

538 files changed

+57208
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

538 files changed

+57208
-283
lines changed

.github/workflows/pr.yml

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,55 @@ jobs:
2525
run: npm --version
2626
- name: Checkout
2727
uses: actions/checkout@v4
28-
- name: npm Package
28+
- name: Get RC Version
2929
run: |
30-
cd WebHelpDocs
31-
npm pack
30+
COMMIT="${{github.sha}}"
31+
if ${{contains(github.head_ref, 'release/')}}; then
32+
V="${{github.head_ref}}"
33+
V="${V#release/}"
34+
else
35+
V="$(npm pkg get version)"
36+
echo "Extracted Version: $V"
37+
V="$(echo v"$V" | sed 's/\"//g')"
38+
echo "Cleaned up Version: $V"
39+
fi
40+
41+
# Check to see if the version tag already exists
42+
# If it does, print a message and exit with an error code
43+
if [ $(git tag --list "$V") ]; then
44+
echo "Version tag already exists. Did you bump the version number?"
45+
exit 1
46+
fi
47+
48+
# Create an RC release if
49+
# 1) This PR is a release branch that hasn't been merged to main.
50+
# 2) This is a feature branch being merged into the main branch.
51+
if ${{(! github.event.pull_request.merged && contains(github.head_ref, 'release/')) || (github.event.pull_request.merged && !contains(github.head_ref, 'release/'))}}; then
52+
V="${V}-$(git tag --list ${V}* | wc -l)"
53+
echo "RC Version: $V"
54+
fi
55+
56+
echo "version=${V}" >> $GITHUB_OUTPUT
57+
npm version --no-git-tag-version "${V}" || true
58+
- name: npm Package All
59+
run: |
60+
cp package.json WebHelpDocs/
61+
cp LICENSE WebHelpDocs/
62+
cp index.js WebHelpDocs/
63+
cp README.md WebHelpDocs/
64+
cd WebHelpDocs
65+
npm pack .
66+
mv *.tgz ..
67+
cd ..
3268
- name: Upload Artifacts
3369
uses: actions/upload-artifact@v4
3470
with:
3571
name: WebHelpDocs
36-
path: ./WebHelpDocs/*.tgz
72+
path: ./*.tgz
3773

3874
publish:
3975
name: Publish
40-
if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) || github.event.pull_request.merged ) }}
76+
if: ${{ endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/') || github.event.pull_request.merged) }}
4177
needs:
4278
- package
4379
runs-on: ubuntu-latest
@@ -46,7 +82,6 @@ jobs:
4682
credentials:
4783
username: ${{github.actor}}
4884
password: ${{secrets.GITHUB_TOKEN}}
49-
#https://github.com/actions/runner/issues/2033#issuecomment-1598547465
5085
options: --user 1001
5186
steps:
5287
- name: Tool Versions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.vscode/settings.json

.gitlab-ci.yml

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

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ 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+
- Added MP5103 webhelp documents
23+
1924
## [0.18.0]
2025

2126
### Added
@@ -44,6 +49,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
4449
- Language feature has been added for DAQ6510 and DMM6500 command set(TSP-304)
4550
- Language feature has been added for 24XX and DMM7510 command set(TSP-232)
4651

52+
[0.19.0]: https://github.com/tektronix/tsp-toolkit-webhelp/releases/tag/v0.19.0
4753
[0.18.0]: https://github.com/tektronix/tsp-toolkit-webhelp/releases/tag/v0.18.0
4854
[0.15.3]: https://github.com/tektronix/tsp-toolkit-webhelp/releases/tag/v0.15.3
4955
[0.15.0]: https://github.com/tektronix/tsp-toolkit-webhelp/releases/tag/v0.15.0

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
# tsp-toolkit-webhelp
2-
This repo contains keithley instrument webhelp manuals, which is going to consumed by tsp-toolkit as npm package.
3-
4-
5-
1+
# Keithley TSP Toolkit Web Help Documents

WebHelpDocs/LICENSE

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

0 commit comments

Comments
 (0)