diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4c8099b..e8c00298 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: App build on: push: branches: - - "add-slack-option" + - "sourced-water" defaults: run: @@ -66,7 +66,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/ParetoUI-24.07.24-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/ParetoUI-24.08.06-win64.exe - name: Upload artifact for windows build uses: actions/upload-artifact@v4 @@ -74,4 +74,4 @@ jobs: with: name: windows-pareto-dist path: | - electron/dist/ParetoUI-24.07.24-win64.exe \ No newline at end of file + electron/dist/ParetoUI-24.08.06-win64.exe \ No newline at end of file diff --git a/electron/package-lock.json b/electron/package-lock.json index ada3cc29..93d1f1a8 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "pareto-ui", - "version": "24.07.24", + "version": "24.08.06", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pareto-ui", - "version": "24.07.24", + "version": "24.08.06", "dependencies": { "@electron/remote": "^2.0.8", "axios": "^0.27.2", diff --git a/electron/package.json b/electron/package.json index 9d2cb381..ee234c2f 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "pareto-ui", - "version": "24.07.24", + "version": "24.08.06", "author": "Michael Pesce", "private": true, "main": "build/main.js", @@ -74,10 +74,10 @@ "nsis": { "oneClick": false, "allowToChangeInstallationDirectory": true, - "artifactName": "ParetoUI-24.07.24-win64.exe" + "artifactName": "ParetoUI-24.08.06-win64.exe" }, "dmg": { - "artifactName": "ParetoUI-24.07.24-arm64.dmg" + "artifactName": "ParetoUI-24.08.06-arm64.dmg" }, "deb": { "depends": [ @@ -86,7 +86,7 @@ "liblapack3", "libblas3" ], - "artifactName": "ParetoUI-24.07.24-amd64.deb" + "artifactName": "ParetoUI-24.08.06-amd64.deb" }, "directories": { "buildResources": "assets" @@ -106,7 +106,7 @@ "win": { "target": "nsis", "icon": "build/pareto-logo.ico", - "artifactName": "ParetoUI-24.07.24-win64.exe" + "artifactName": "ParetoUI-24.08.06-win64.exe" }, "linux": { "target": "Deb", diff --git a/electron/ui/cypress/e2e/ScenarioTests.cy.js b/electron/ui/cypress/e2e/ScenarioTests.cy.js index 375c17b2..14865928 100644 --- a/electron/ui/cypress/e2e/ScenarioTests.cy.js +++ b/electron/ui/cypress/e2e/ScenarioTests.cy.js @@ -174,7 +174,7 @@ describe('scenario testing', () => { //validate results cy.contains(/recycling rate/i).should('be.visible') cy.contains(/total disposal/i).should('be.visible') - cy.contains(/groundwater source/i).should('be.visible') + cy.contains(/sourced water/i).should('be.visible') cy.contains(/capex/i).should('be.visible') cy.contains(/opex/i).should('be.visible') }) diff --git a/electron/ui/src/views/LandingPage/LandingPage.js b/electron/ui/src/views/LandingPage/LandingPage.js index 6befb146..e9fa94de 100644 --- a/electron/ui/src/views/LandingPage/LandingPage.js +++ b/electron/ui/src/views/LandingPage/LandingPage.js @@ -58,7 +58,7 @@ export default function LandingPage(props) { - v24.07.24 (PARETO v{process.env.REACT_APP_PARETO_VERSION}) + v24.08.06 (PARETO v{process.env.REACT_APP_PARETO_VERSION}) diff --git a/electron/ui/src/views/ModelResults/KPIDashboard.js b/electron/ui/src/views/ModelResults/KPIDashboard.js index b841617e..3f8fbfa1 100644 --- a/electron/ui/src/views/ModelResults/KPIDashboard.js +++ b/electron/ui/src/views/ModelResults/KPIDashboard.js @@ -198,7 +198,7 @@ export default function KPIDashboard(props) { - Groundwater Sourced + Sourced Water
v24.07.24 (PARETO v{process.env.REACT_APP_PARETO_VERSION})
v24.08.06 (PARETO v{process.env.REACT_APP_PARETO_VERSION})
Groundwater Sourced
Sourced Water