From ae2ab9e5473e1178582df51742aff10a70a33727 Mon Sep 17 00:00:00 2001 From: Santiago Martinez Date: Thu, 11 Jan 2024 21:44:07 +0000 Subject: [PATCH 1/3] check build script --- .github/workflows/bundle.yml | 111 ++++++++++++++++++----------------- scripts/bundle.sh | 3 + 2 files changed, 60 insertions(+), 54 deletions(-) diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index 9f774e4f..af6d49b8 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -1,33 +1,33 @@ name: Bundle App on: workflow_dispatch: - release: - types: [published] + # release: + # types: [published] jobs: - build-windows: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - uses: actions/setup-node@v4 - with: - node-version: 21 - - shell: pwsh - run: scripts/update_front.ps1 - - shell: pwsh - run: scripts/update_guide.ps1 - - shell: pwsh - run: scripts/bundle.ps1 - - run: | - mkdir dist/ - mv "back/dist/whombat.exe" "dist/whombat-windows-${{ github.ref_name }}.exe" - - uses: shogo82148/actions-upload-release-asset@v1 - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: "dist/whombat-windows-${{ github.ref_name }}.exe" + # build-windows: + # runs-on: windows-latest + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/setup-python@v4 + # with: + # python-version: "3.11" + # - uses: actions/setup-node@v4 + # with: + # node-version: 21 + # - shell: pwsh + # run: scripts/update_front.ps1 + # - shell: pwsh + # run: scripts/update_guide.ps1 + # - shell: pwsh + # run: scripts/bundle.ps1 + # - run: | + # mkdir dist/ + # mv "back/dist/whombat.exe" "dist/whombat-windows-${{ github.ref_name }}.exe" + # - uses: shogo82148/actions-upload-release-asset@v1 + # with: + # upload_url: ${{ github.event.release.upload_url }} + # asset_path: "dist/whombat-windows-${{ github.ref_name }}.exe" build-ubuntu: runs-on: ubuntu-20.04 @@ -43,33 +43,36 @@ jobs: - run: make build-frontend - run: make build-guide - run: make bundle-pyinstaller - - run: | - mkdir dist/ - chmod +x "back/dist/whombat" - mv back/dist/whombat "dist/whombat-ubuntu-${{ github.ref_name }}" - - uses: shogo82148/actions-upload-release-asset@v1 - with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: "dist/whombat-ubuntu-${{ github.ref_name }}" - - build-macos: - runs-on: macos-11 - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: "3.11" - - uses: actions/setup-node@v4 - with: - node-version: 21 - - run: make build-frontend - - run: make build-guide - - run: make bundle-pyinstaller - - run: | - mkdir dist/ - chmod +x "back/dist/whombat" - mv back/dist/whombat "dist/whombat-macos-${{ github.ref_name }}" - - uses: shogo82148/actions-upload-release-asset@v1 + - uses: actions/upload-artifact@v4 with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: "dist/whombat-macos-${{ github.ref_name }}" + name: whombat-ubuntu + path: back/dist/whombat + # - run: | + # mkdir dist/ + # mv back/dist/whombat "dist/whombat-ubuntu-${{ github.ref_name }}" + # - uses: shogo82148/actions-upload-release-asset@v1 + # with: + # upload_url: ${{ github.event.release.upload_url }} + # asset_path: "dist/whombat-ubuntu-${{ github.ref_name }}" + # + # build-macos: + # runs-on: macos-11 + # steps: + # - uses: actions/checkout@v3 + # - uses: actions/setup-python@v4 + # with: + # python-version: "3.11" + # - uses: actions/setup-node@v4 + # with: + # node-version: 21 + # - run: make build-frontend + # - run: make build-guide + # - run: make bundle-pyinstaller + # - run: | + # mkdir dist/ + # chmod +x "back/dist/whombat" + # mv back/dist/whombat "dist/whombat-macos-${{ github.ref_name }}" + # - uses: shogo82148/actions-upload-release-asset@v1 + # with: + # upload_url: ${{ github.event.release.upload_url }} + # asset_path: "dist/whombat-macos-${{ github.ref_name }}" diff --git a/scripts/bundle.sh b/scripts/bundle.sh index 2f7d70b9..93cd6bda 100644 --- a/scripts/bundle.sh +++ b/scripts/bundle.sh @@ -41,3 +41,6 @@ build/.venv/bin/pyinstaller \ --name whombat \ --onefile \ app.py + + +chmod +x dist/whombat From 2e3638f6d247c4a2a73e2a86e67261c4aa42f554 Mon Sep 17 00:00:00 2001 From: Santiago Martinez Date: Thu, 11 Jan 2024 22:07:12 +0000 Subject: [PATCH 2/3] Removed loading alembic config from file --- back/src/whombat/database/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/src/whombat/database/utils.py b/back/src/whombat/database/utils.py index 007cf5b5..0554544f 100644 --- a/back/src/whombat/database/utils.py +++ b/back/src/whombat/database/utils.py @@ -158,7 +158,7 @@ def create_alembic_config(db_url: str | URL, is_async: bool = True) -> Config: db_url = make_url(db_url) db_url = validate_database_url(db_url, is_async=is_async) - cfg = Config("alembic.ini") + cfg = Config() cfg.set_main_option("script_location", "whombat:migrations") cfg.set_main_option("sqlalchemy.url", db_url.render_as_string()) From 51bab957b7810df4ed3bf6b8368c3c5d64e0a754 Mon Sep 17 00:00:00 2001 From: Santiago Martinez Date: Thu, 11 Jan 2024 22:26:16 +0000 Subject: [PATCH 3/3] Zip executable before uploading --- .github/workflows/bundle.yml | 110 +++++++++++++++++------------------ scripts/bundle.ps1 | 4 ++ scripts/bundle.sh | 3 + 3 files changed, 59 insertions(+), 58 deletions(-) diff --git a/.github/workflows/bundle.yml b/.github/workflows/bundle.yml index af6d49b8..152517d4 100644 --- a/.github/workflows/bundle.yml +++ b/.github/workflows/bundle.yml @@ -1,33 +1,32 @@ name: Bundle App on: - workflow_dispatch: - # release: - # types: [published] + release: + types: [published] jobs: - # build-windows: - # runs-on: windows-latest - # steps: - # - uses: actions/checkout@v3 - # - uses: actions/setup-python@v4 - # with: - # python-version: "3.11" - # - uses: actions/setup-node@v4 - # with: - # node-version: 21 - # - shell: pwsh - # run: scripts/update_front.ps1 - # - shell: pwsh - # run: scripts/update_guide.ps1 - # - shell: pwsh - # run: scripts/bundle.ps1 - # - run: | - # mkdir dist/ - # mv "back/dist/whombat.exe" "dist/whombat-windows-${{ github.ref_name }}.exe" - # - uses: shogo82148/actions-upload-release-asset@v1 - # with: - # upload_url: ${{ github.event.release.upload_url }} - # asset_path: "dist/whombat-windows-${{ github.ref_name }}.exe" + build-windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: "3.11" + - uses: actions/setup-node@v4 + with: + node-version: 21 + - shell: pwsh + run: scripts/update_front.ps1 + - shell: pwsh + run: scripts/update_guide.ps1 + - shell: pwsh + run: scripts/bundle.ps1 + - run: | + mkdir dist/ + mv "back/dist/whombat.zip" "dist/whombat-windows-${{ github.ref_name }}.zip" + - uses: shogo82148/actions-upload-release-asset@v1 + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: "dist/whombat-windows-${{ github.ref_name }}.zip" build-ubuntu: runs-on: ubuntu-20.04 @@ -43,36 +42,31 @@ jobs: - run: make build-frontend - run: make build-guide - run: make bundle-pyinstaller - - uses: actions/upload-artifact@v4 + - run: | + mkdir dist/ + mv back/dist/whombat.zip "dist/whombat-ubuntu-${{ github.ref_name }}.zip" + - uses: shogo82148/actions-upload-release-asset@v1 + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: "dist/whombat-ubuntu-${{ github.ref_name }}.zip" + + build-macos: + runs-on: macos-11 + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: "3.11" + - uses: actions/setup-node@v4 + with: + node-version: 21 + - run: make build-frontend + - run: make build-guide + - run: make bundle-pyinstaller + - run: | + mkdir dist/ + mv back/dist/whombat.zip "dist/whombat-macos-${{ github.ref_name }}.zip" + - uses: shogo82148/actions-upload-release-asset@v1 with: - name: whombat-ubuntu - path: back/dist/whombat - # - run: | - # mkdir dist/ - # mv back/dist/whombat "dist/whombat-ubuntu-${{ github.ref_name }}" - # - uses: shogo82148/actions-upload-release-asset@v1 - # with: - # upload_url: ${{ github.event.release.upload_url }} - # asset_path: "dist/whombat-ubuntu-${{ github.ref_name }}" - # - # build-macos: - # runs-on: macos-11 - # steps: - # - uses: actions/checkout@v3 - # - uses: actions/setup-python@v4 - # with: - # python-version: "3.11" - # - uses: actions/setup-node@v4 - # with: - # node-version: 21 - # - run: make build-frontend - # - run: make build-guide - # - run: make bundle-pyinstaller - # - run: | - # mkdir dist/ - # chmod +x "back/dist/whombat" - # mv back/dist/whombat "dist/whombat-macos-${{ github.ref_name }}" - # - uses: shogo82148/actions-upload-release-asset@v1 - # with: - # upload_url: ${{ github.event.release.upload_url }} - # asset_path: "dist/whombat-macos-${{ github.ref_name }}" + upload_url: ${{ github.event.release.upload_url }} + asset_path: "dist/whombat-macos-${{ github.ref_name }}.zip" diff --git a/scripts/bundle.ps1 b/scripts/bundle.ps1 index 26eb6f12..db4eda9b 100644 --- a/scripts/bundle.ps1 +++ b/scripts/bundle.ps1 @@ -38,3 +38,7 @@ build\.venv\Scripts\pyinstaller ` --name whombat ` --onefile ` app.py + + +# Zip the executable file +Compress-Archive -Path "dist\whombat.exe" -DestinationPath "dist\whombat.zip" diff --git a/scripts/bundle.sh b/scripts/bundle.sh index 93cd6bda..0f7d84da 100644 --- a/scripts/bundle.sh +++ b/scripts/bundle.sh @@ -44,3 +44,6 @@ build/.venv/bin/pyinstaller \ chmod +x dist/whombat + +# Zip the executable file +zip -r dist/whombat.zip dist/whombat