Skip to content

Commit

Permalink
Merge pull request #16 from netfoundry/change_extraction_directory
Browse files Browse the repository at this point in the history
Changed extracting path of pyinstaller from /tmp to /opt/netfoundry
  • Loading branch information
emoscardini authored Oct 4, 2023
2 parents 1982379 + b135034 commit 69aa287
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 25 deletions.
30 changes: 6 additions & 24 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
python -m pip install --upgrade pip
pip install -r requirements.txt
- name: Use pyinstall to create distribution binary
run: pyinstaller -F support_bundle_bootstrap.py
run: mkdir /opt/netfoundry; pyinstaller -F support_bundle_bootstrap.py --runtime-tmpdir /opt/netfoundry/
- name: version
run: echo "version=$(./dist/support_bundle -v)" >> $GITHUB_ENV
id: version
Expand All @@ -34,33 +34,15 @@ jobs:
run: cd dist; mv support_bundle_bootstrap vm-support-bundle; tar -zcvf support_bundle_bootstrap.tar.gz vm-support-bundle
- name: Tar main script
run: cd dist; mv support_bundle .support_bundle; tar cfvz support_bundle.tar.gz .support_bundle

- name: release
uses: actions/create-release@v1
uses: ncipollo/release-action@v1
id: release
with:
draft: false
prerelease: false
release_name: v${{ env.version }}
tag_name: v${{ env.version }}
tag: v${{ env.version }}
artifacts: "dist/support_bundle_bootstrap.tar.gz,dist/support_bundle.tar.gz"
artifactContentType: application/gzip
env:
GITHUB_TOKEN: ${{ github.token }}

- name: Upload support_bundle bootstrap release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ github.token }}
with:
upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: dist/support_bundle_bootstrap.tar.gz
asset_name: support_bundle_bootstrap.tar.gz
asset_content_type: application/gzip

- name: Upload support_bundle release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ github.token }}
with:
upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: dist/support_bundle.tar.gz
asset_name: support_bundle.tar.gz
asset_content_type: application/gzip
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.3.0] - 2023-10-04

### Changed

- Changed extracting path of pyinstaller from /tmp to /opt/netfoundry


## [1.2.1] - 2023-03-20
### Changed:

Expand Down
Binary file modified dist/support_bundle
Binary file not shown.
2 changes: 1 addition & 1 deletion support_bundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ def main():
# main
if __name__ == '__main__':
try:
__version__ = '1.2.1'
__version__ = '1.3.0'
# change log
# https://github.com/netfoundry/edge-router-support-bundle/blob/main/CHANGELOG.md

Expand Down

0 comments on commit 69aa287

Please sign in to comment.