From 31a2bb932e76a548f9d941db5c99b9debeb5bfed Mon Sep 17 00:00:00 2001 From: Edward Moscardini Date: Wed, 4 Oct 2023 12:27:28 -0400 Subject: [PATCH 1/3] Changed extracting path of pyinstaller from /tmp to /opt/netfoundry --- .github/workflows/release.yml | 31 +++++++------------------------ CHANGELOG.md | 7 +++++++ router_upgrade.py | 2 +- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7cb9a46..9769613 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt - name: Use pyinstall to create distribution binary - run: pyinstaller -F router_upgrade_bootstrap.py + run: pyinstaller -F router_upgrade_bootstrap.py --runtime-tmpdir /opt/netfoundry/ - name: Use pyinstall to create main binary - run: pyinstaller -F router_upgrade.py + run: pyinstaller -F router_upgrade.py --runtime-tmpdir /opt/netfoundry/ - name: version run: echo "version=$(./dist/router_upgrade -v)" >> $GITHUB_ENV id: version @@ -37,33 +37,16 @@ jobs: - name: Tar main script # tar with previous distibuted name for backwards compatibility run: cd dist; mv router_upgrade .router_upgrade; tar -zcvf router_upgrade.tar.gz .router_upgrade + - 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 }} - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: Upload router_upgrade bootstrap release - uses: actions/upload-release-asset@v1 + tag: v${{ env.version }} + artifacts: "dist/router_upgrade_bootstrap.tar.gz,dist/router_upgrade.tar.gz" + artifactContentType: application/gzip env: GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ steps.release.outputs.upload_url }} - asset_path: dist/router_upgrade_bootstrap.tar.gz - asset_name: router_upgrade_bootstrap.tar.gz - asset_content_type: application/gzip - - name: Upload router_upgrade release - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ github.token }} - with: - upload_url: ${{ steps.release.outputs.upload_url }} - asset_path: dist/router_upgrade.tar.gz - asset_name: router_upgrade.tar.gz - asset_content_type: application/gzip diff --git a/CHANGELOG.md b/CHANGELOG.md index b7fe947..95d9603 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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.2.0] + +### Changed + +- Changed extracting path of pyinstaller from /tmp to /opt/netfoundry + + ## [1.1.2] - 2023-07-17 ### Added diff --git a/router_upgrade.py b/router_upgrade.py index 5704d3f..99f017f 100644 --- a/router_upgrade.py +++ b/router_upgrade.py @@ -346,7 +346,7 @@ def main(): """ Main logic """ - __version__ = '1.1.2' + __version__ = '1.2.0' # Change log # See https://github.com/netfoundry/edge-router-upgrade/blob/main/CHANGELOG.md From 2e847643d471be548bb079d3546fac0415f1856b Mon Sep 17 00:00:00 2001 From: Edward Moscardini Date: Wed, 4 Oct 2023 15:28:25 -0400 Subject: [PATCH 2/3] fix data in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95d9603..8e4dbeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ 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.2.0] +## [1.2.0] - 2023-10-04 ### Changed From 81be4370b95ebdbb3bea282fd3400e18bcaa977c Mon Sep 17 00:00:00 2001 From: Edward Moscardini Date: Wed, 4 Oct 2023 16:53:22 -0400 Subject: [PATCH 3/3] fix release flow --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9769613..2a3f9e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - name: Use pyinstall to create distribution binary run: pyinstaller -F router_upgrade_bootstrap.py --runtime-tmpdir /opt/netfoundry/ - name: Use pyinstall to create main binary - run: pyinstaller -F router_upgrade.py --runtime-tmpdir /opt/netfoundry/ + run: mkdir /opt/netfoundry; pyinstaller -F router_upgrade.py --runtime-tmpdir /opt/netfoundry/ - name: version run: echo "version=$(./dist/router_upgrade -v)" >> $GITHUB_ENV id: version