Skip to content

Commit

Permalink
Merge pull request #45 from MichaelPesce/update-workflow-new-cert
Browse files Browse the repository at this point in the history
update workflow to add code signing from new cert
  • Loading branch information
MichaelPesce authored Sep 19, 2023
2 parents 0f8d24c + f25eb2f commit 5895c16
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 29 deletions.
55 changes: 30 additions & 25 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: App build
on:
push:
branches:
- "new-sra-diagram"
- "update-workflow-new-cert"

defaults:
run:
Expand All @@ -19,16 +19,20 @@ jobs:

runs-on: windows-latest

env:
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
# env:
# CSC_LINK: ${{ secrets.CSC_LINK }}
# CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
with:
environment-file: environment.yml
activate-environment: pareto-ui-env

- name: Install Azure Signtool
run: |
dotnet tool install --global AzureSignTool
- name: Install Electron JS dependencies
run: |
Expand Down Expand Up @@ -56,21 +60,25 @@ jobs:
- name: Build Windows Distribution
run: npm --prefix electron run electron-build-win

- 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-09.19.23-win64.exe
- name: Upload artifact for windows build
uses: actions/upload-artifact@v3
if: always()
with:
name: windows-pareto-dist
path: |
electron/dist/ParetoUI-08.28.23-win64.exe
# linux-build:
# name: Linux Build
electron/dist/ParetoUI-09.19.23-win64.exe
# windows-build:
# name: Windows Build

# runs-on: ubuntu-latest
# runs-on: windows-latest

# env:
# CI: false
# env:
# CSC_LINK: ${{ secrets.CSC_LINK }}
# CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}

# steps:
# - uses: actions/checkout@v3
Expand All @@ -85,33 +93,30 @@ jobs:
# - name: Install frontend JS dependencies
# run: |
# npm --prefix electron/ui clean-install
# - name: Install GNU FORTRAN, GOMP, Blas, and Lapack libraries
# run: |
# sudo apt-get install -y libgfortran5 libgomp1 liblapack3 libblas3
# - name: Get idaes extensions
# run: idaes get-extensions

# # - name: Install Pareto locally
# # working-directory: ../
# # run: git clone https://github.com/MichaelPesce/project-pareto.git && cd project-pareto && git fetch --all && git checkout 0.5.0_release && pip install --progress-bar off .

# - name: Install Pareto locally
# working-directory: ../
# run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && pip install --progress-bar off .
# run: git clone https://github.com/project-pareto/project-pareto.git && cd project-pareto && git fetch --all --tags && git checkout 0.8.0 && pip install --progress-bar off .

# - name: Build Backend
# run: npm --prefix electron run build-backend

# - name: Build Frontend
# run: npm --prefix electron run build-frontend

# # for some reason, ico file breaks linux build. going without icon for now
# - name: Remove ico file
# run: rm electron/build/pareto-logo.ico
# run: npm --prefix electron run build-frontend-win

# - name: Build Linux Distribution
# run: npm --prefix electron run electron-build-lin
# - name: Build Windows Distribution
# run: npm --prefix electron run electron-build-win

# - name: Upload artifact for linux build
# - name: Upload artifact for windows build
# uses: actions/upload-artifact@v3
# if: always()
# with:
# name: linux-dist
# name: windows-pareto-dist
# path: |
# electron/dist/pareto-ui_0.1.0_amd64.deb
# electron/dist/ParetoUI-09.19.23-win64.exe
8 changes: 4 additions & 4 deletions electron/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pareto-ui",
"version": "08.25.23",
"version": "09.19.23",
"author": "Michael Pesce",
"private": true,
"main": "build/main.js",
Expand Down Expand Up @@ -74,10 +74,10 @@
"nsis": {
"oneClick": false,
"allowToChangeInstallationDirectory": true,
"artifactName": "ParetoUI-08.28.23-win64.exe"
"artifactName": "ParetoUI-09.19.23-win64.exe"
},
"dmg": {
"artifactName": "ParetoUI-08.28.23-arm64.dmg"
"artifactName": "ParetoUI-09.19.23-arm64.dmg"
},
"deb": {
"depends": [
Expand All @@ -86,7 +86,7 @@
"liblapack3",
"libblas3"
],
"artifactName": "ParetoUI-08.28.23-amd64.deb"
"artifactName": "ParetoUI-09.19.23-amd64.deb"
},
"directories": {
"buildResources": "assets"
Expand Down

0 comments on commit 5895c16

Please sign in to comment.