Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.10.0 #95

Merged
merged 5 commits into from
Nov 22, 2023
Merged

0.10.0 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f082cf4
0.10.0 build
MichaelPesce Oct 6, 2023
683f722
updated splash page
MichaelPesce Oct 6, 2023
1824a5e
manually install different numpy and pandas versions in build
MichaelPesce Oct 6, 2023
66cf926
merge main in
MichaelPesce Nov 15, 2023
65583fa
0.10.0 build
MichaelPesce Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions .github/workflows/electron-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: App build
on:
push:
branches:
- "code-sign-setup"
- "0.10.0"

defaults:
run:
Expand Down Expand Up @@ -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.9.0rc0 && 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: |
Expand All @@ -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
Expand All @@ -75,7 +85,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
Expand All @@ -84,7 +94,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

Expand Down
6 changes: 3 additions & 3 deletions electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "watertap-ui",
"author": "Michael Pesce <[email protected]>",
"version": "09.18.23",
"version": "23.10.06",
"private": true,
"main": "build/main.js",
"dependencies": {
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions electron/ui/src/views/SplashPage/SplashPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ export default function SplashPage() {
</Grid>
<Grid item xs={2}> </Grid>

<Grid item xs={5}> </Grid>
<Grid item xs={2}>
<Grid item xs={3}> </Grid>
<Grid item xs={6}>
<Box>
<p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v 1.0.0</p>
<p style={{paddingTop:0, marginTop: 0, color:"#9c9c9c"}}>v23.10.06 (WaterTAP v0.10.0)</p>
</Box>
</Grid>
<Grid item xs={5}> </Grid>
<Grid item xs={3}> </Grid>

<Grid item xs={1}> </Grid>
<Grid item xs={10}>
Expand Down