Skip to content

Commit

Permalink
Merge branch 'azure-trusted-signing' of https://github.com/fairdataih…
Browse files Browse the repository at this point in the history
…ub/SODA-for-SPARC into azure-trusted-signing
  • Loading branch information
aaronm-2112 committed Jan 23, 2025
2 parents 9e177e7 + f7c8663 commit 1fc8902
Show file tree
Hide file tree
Showing 27 changed files with 19,101 additions and 120 deletions.
1 change: 1 addition & 0 deletions .github/workflows/Build-and-deploy-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- main
- staging
- pre-staging
- guest-contributor-fixes-ui-update

jobs:
deploy-on-linux:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/Build-and-deploy-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- main
- staging
- pre-staging
- guest-contributor-fixes-ui-update

jobs:
deploy-on-mac:
Expand Down
22 changes: 17 additions & 5 deletions .github/workflows/Build-and-deploy-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- main
- staging
- pre-staging
- azure-trusted-signing

jobs:
deploy-on-windows:
Expand Down Expand Up @@ -42,8 +43,19 @@ jobs:
- name: Install package.json modules and their dependencies
run: npm install --ignore-scripts

- name: Deploy the app to GitHub
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm run deploy-win
- name: Build the app for Windows
run: npm run build-win

- name: Sign files with Trusted Signing V1.1
uses: azure/[email protected]
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
endpoint: https://eus.codesigning.azure.net/
trusted-signing-account-name: fdih-signing-account
certificate-profile-name: california-medical-innovations-institute
files: ${{ github.workspace }}\dist\win-unpacked\resources\app.exe
file-digest: SHA256
timestamp-rfc3161: http://timestamp.acs.microsoft.com
timestamp-digest: SHA256
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ All notable changes to SODA will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## v15.3.0 - 2024-12-26

## Feature Additions:

- Pennsieve guest users can use the Prepare Datset Step-by-Step to edit their Pennsieve datasets.
- SODA's server starts faster on Mac computers.
- SODA will notify users if it is determined that a network setting may be preventing communication to the Pennsieve platform.
- The `Prepare Dataset Step-by-Step` feature allows users to resume curating a dataset even when that dataset saved files that have since been deleted from the computer.

## Bug Fixes:

- Fixed an uncommon issue where subjects and samples were not being saved in the Prepare Dataset Step-by-Step progress file if the user did not move to the next page before exiting.

## v15.2.3 - 2024-11-20

## Bug Fixes:
Expand Down
3 changes: 1 addition & 2 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ win:
extraResources:
- from: ./file_templates
to: ./file_templates
- from: ./pyflaskdist/app.exe
- from: ./pyflaskdist/app
asar: true
target:
- nsis
Expand All @@ -31,7 +31,6 @@ nsis:
mac:
icon: "app-icon/png/icon.png"
entitlementsInherit: ./entitlements.mac.inherit.plist
notarize: true
extraResources:
- from: ./pyflaskdist/app
- from: ./file_templates
Expand Down
Loading

0 comments on commit 1fc8902

Please sign in to comment.