Skip to content

Commit

Permalink
Merge 88787ef into 43a1735
Browse files Browse the repository at this point in the history
  • Loading branch information
esarver authored Jul 1, 2024
2 parents 43a1735 + 88787ef commit 84a522c
Show file tree
Hide file tree
Showing 4 changed files with 451 additions and 6,962 deletions.
36 changes: 35 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
run: npm run compile
- name: npm Package
run: |
npx vsce package --pre-release
npx vsce package
- name: Run ClamAV
run: clamscan -v *.vsix
- name: Upload Artifacts
Expand All @@ -132,6 +132,40 @@ jobs:
name: package
path: "*.vsix"

publish:
name: Publish
runs-on: ubuntu-latest
permissions:
contents: write
checks: write
pull-requests: read
packages: read
needs:
- compile
- test
- sbom
- lint
- style
if: ${{ (endsWith(github.base_ref, 'main') && (contains(github.head_ref, 'release/')) || github.event.pull_request.merged ) }}
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
fetch-tags: true
- name: Get Artifacts
uses: actions/download-artifact@v3
with:
name: package
path: extension
- name: Publish to VSCode Marketplace
run: |
echo "//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}" > .npmrc
npm install --devDependencies
npx vcse publish --packagePath extension/*.vsix
env:
VSCE_PAT: ${{secrets.VSCE_PAT}}

release:
name: Release
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
- Add message when starting FW upgrade (TSP-455)
- Feature to retrieve TSP-Link network details

<!--Version Comparison Links-->
<!-- Version Comparison Links -->
[Unreleased]: https://github.com/tektronix/tsp-toolkit/compare/v0.16.1...HEAD
[0.16.1]: https://github.com/tektronix/tsp-toolkit/releases/tag/v0.16.1
[0.15.3]: https://github.com/tektronix/tsp-toolkit/releases/tag/v0.15.3
Expand Down
Loading

0 comments on commit 84a522c

Please sign in to comment.