Merge pull request #731 from oracle/toxophilist/sprint-dev

build: change windows upload to remove wildcard on file name
oracle · Dec 4, 2024 · c6f6013 · c6f6013
2 parents 0e3a65f + adb8832
commit c6f6013
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build-desktop-application.yml b/.github/workflows/build-desktop-application.yml
@@ -92,7 +92,8 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: |
           ls ./ocd/dist/make/squirrel.windows/x64
-          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/make/squirrel.windows/x64/ocd-${{ env.OCD_VERSION }}*.exe --clobber
+          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/make/squirrel.windows/x64/ocd-${{ env.OCD_VERSION }}-Setup.exe --clobber
+          ls ./ocd/dist/make/squirrel.windows/x64
           # gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/win/ocd-${{ env.OCD_VERSION }}-x64.exe --clobber
       - name: Upload Linux Artifact to Release
         if: matrix.os == 'ubuntu-latest'

diff --git a/ocd/packages/desktop/src/main.ts b/ocd/packages/desktop/src/main.ts
@@ -14,8 +14,8 @@ import { OcdDesign } from '@ocd/model'
 import { OcdCache, OcdConsoleConfiguration } from '@ocd/react'
 // import { unescape } from 'querystring'
 
-// app.commandLine.appendSwitch('ignore-certificate-errors') // Temporary work around for not being able to add additional certificates
-// process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' // Temporary work around for not being able to add additional certificates
+app.commandLine.appendSwitch('ignore-certificate-errors') // Temporary work around for not being able to add additional certificates
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' // Temporary work around for not being able to add additional certificates
 
 // Get Environment information
 const isDev = process.env.OCD_DEV === 'true';