From f082cf4243fcfb00963b4be37b5a7ad4c4d528a4 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 6 Oct 2023 10:21:07 -0500 Subject: [PATCH 1/4] 0.10.0 build --- .github/workflows/electron-build.yml | 8 ++++---- electron/package.json | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index 4bf2ebf9..75fd3432 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "code-sign-setup" + - "0.10.0" defaults: run: @@ -50,7 +50,7 @@ jobs: - name: Install Watertap locally working-directory: ../ - run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 0.9.0rc0 && pip install --progress-bar off . + run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 0.10.0 && pip install --progress-bar off . - name: Transfer Entry points run: | @@ -75,7 +75,7 @@ jobs: - name: Sign Windows Distribution run: | - AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/WaterTAP-UI_09.18.23_win64.exe + AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v electron/dist/WaterTAP-UI_23.10.06_win64.exe - name: Upload artifact for windows build @@ -84,7 +84,7 @@ jobs: with: name: windows-dist path: | - electron/dist/WaterTAP-UI_09.18.23_win64.exe + electron/dist/WaterTAP-UI_23.10.06_win64.exe # windows-build: # name: Windows Build diff --git a/electron/package.json b/electron/package.json index 5ccbdc62..73c26e6a 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,7 +1,7 @@ { "name": "watertap-ui", "author": "Michael Pesce ", - "version": "09.18.23", + "version": "23.10.06", "private": true, "main": "build/main.js", "dependencies": { @@ -70,7 +70,7 @@ "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, - "artifactName": "WaterTAP-UI_09.18.23_win64.exe" + "artifactName": "WaterTAP-UI_23.10.06_win64.exe" }, "deb": { "depends": [ @@ -106,7 +106,7 @@ "win": { "target": "nsis", "icon": "build/nawi-logo.ico", - "artifactName": "WaterTAP-UI_09.18.23_win64.exe" + "artifactName": "WaterTAP-UI_23.10.06_win64.exe" }, "linux": { "target": "Deb", From 683f722a57e858b142a594bf8f4191550c6d13c6 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 6 Oct 2023 10:23:34 -0500 Subject: [PATCH 2/4] updated splash page --- electron/ui/src/views/SplashPage/SplashPage.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/electron/ui/src/views/SplashPage/SplashPage.js b/electron/ui/src/views/SplashPage/SplashPage.js index 43670255..378b4c56 100644 --- a/electron/ui/src/views/SplashPage/SplashPage.js +++ b/electron/ui/src/views/SplashPage/SplashPage.js @@ -55,13 +55,13 @@ export default function SplashPage() { - - + + -

v 1.0.0

+

v23.10.06 (WaterTAP v0.10.0)

 - + From 1824a5eae3c2d7738c5b5dcbb6f0addbf3be3801 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Fri, 6 Oct 2023 12:36:01 -0500 Subject: [PATCH 3/4] manually install different numpy and pandas versions in build --- .github/workflows/electron-build.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index 75fd3432..d4fad27d 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -60,6 +60,16 @@ jobs: run: | pip install --progress-bar off . + # install slightly older versions of numpy, pandas, and scipy. + # having issues when freezing the latest packages of each (numpy 1.26, pandas 2.1, scipy 1.11) + - name: Install numpy 1.24.3 + run: | + pip uninstall -y numpy && pip install numpy==1.24.3 + + - name: Install pandas 2.0.3 + run: | + pip uninstall -y pandas && pip install pandas==2.0.3 + - name: Install scipy 1.9.1 run: | pip uninstall -y scipy && pip install scipy==1.9.1 From 65583fa0e481bf95582629baf2b7640e67bf6e69 Mon Sep 17 00:00:00 2001 From: MichaelPesce Date: Wed, 15 Nov 2023 16:01:28 -0600 Subject: [PATCH 4/4] 0.10.0 build --- .github/workflows/electron-build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/electron-build.yml b/.github/workflows/electron-build.yml index d4fad27d..7f0c7baf 100644 --- a/.github/workflows/electron-build.yml +++ b/.github/workflows/electron-build.yml @@ -44,13 +44,13 @@ jobs: - name: Get idaes extensions run: idaes get-extensions - # - name: Install Watertap locally - # working-directory: ../ - # run: git clone https://github.com/MichaelPesce/watertap.git && cd watertap && git fetch --all && git checkout springmeeting-2023 && pip install --progress-bar off . - - name: Install Watertap locally working-directory: ../ - run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 0.10.0 && pip install --progress-bar off . + run: git clone https://github.com/MichaelPesce/watertap.git && cd watertap && git fetch --all && git checkout 0.10.0_michael && pip install --progress-bar off . + + # - name: Install Watertap locally + # working-directory: ../ + # run: git clone https://github.com/watertap-org/watertap.git && cd watertap && git fetch --all --tags && git checkout 0.10.0 && pip install --progress-bar off . - name: Transfer Entry points run: |