Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 17 additions & 20 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ jobs:
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
#---GRY--- Temporarily disable code signing since our EV certificate has expired and we are waiting for a new one.
# WINDOWS_CSC_LINK: EVCertificate.pfx
# WINDOWS_CSC_KEY_PASSWORD: ${{ secrets.EV_CERTIFICATE_PASSWORD }}
# EV_CERTIFICATE_BASE64: ${{ secrets.EV_CERTIFICATE_BASE64 }}
WINDOWS_CSC_LINK: EVCertificate.pfx
WINDOWS_CSC_KEY_PASSWORD: ${{ secrets.EV_CERTIFICATE_PASSWORD }}
EV_CERTIFICATE_BASE64: ${{ secrets.EV_CERTIFICATE_BASE64 }}
MACOS_CSC_LINK: DeveloperIDApplicationCertificate.p12
MACOS_CSC_KEY_PASSWORD: ${{ secrets.DEVELOPER_ID_APPLICATION_CERTIFICATE_PASSWORD }}
DEVELOPER_ID_APPLICATION_CERTIFICATE_BASE64: ${{ secrets.DEVELOPER_ID_APPLICATION_CERTIFICATE_BASE64 }}
Expand All @@ -50,14 +49,13 @@ jobs:
timezoneMacos: 'Pacific/Auckland'
- name: Check out OpenCOR
uses: actions/checkout@v4
#---GRY--- Temporarily disable code signing since our EV certificate has expired and we are waiting for a new one.
# - name: Retrieve the EV certificate (Windows only)
# if: ${{ runner.os == 'Windows' }}
# shell: bash
# run: |
# echo "CSC_LINK=$(echo $WINDOWS_CSC_LINK)" >> $GITHUB_ENV
# echo "CSC_KEY_PASSWORD=$(echo $WINDOWS_CSC_KEY_PASSWORD)" >> $GITHUB_ENV
# echo -n $EV_CERTIFICATE_BASE64 | base64 -d > $WINDOWS_CSC_LINK
- name: Retrieve the EV certificate (Windows only)
if: ${{ runner.os == 'Windows' }}
shell: bash
run: |
echo "CSC_LINK=$(echo $WINDOWS_CSC_LINK)" >> $GITHUB_ENV
echo "CSC_KEY_PASSWORD=$(echo $WINDOWS_CSC_KEY_PASSWORD)" >> $GITHUB_ENV
echo -n $EV_CERTIFICATE_BASE64 | base64 -d > $WINDOWS_CSC_LINK
- name: Retrieve the Developer ID Application certificates (macOS only)
if: ${{ runner.os == 'macOS' }}
run: |
Expand All @@ -78,14 +76,13 @@ jobs:
unzip -j bun.zip -d $env:USERPROFILE\.bun
del bun.zip
echo "$env:USERPROFILE\.bun" >> $env:GITHUB_PATH
#---GRY--- Temporarily disable code signing since our EV certificate has expired and we are waiting for a new one.
# - name: Make sure that we can sign OpenCOR (Windows ARM only)
# if: ${{ matrix.name == 'Windows (ARM)' }}
# run: |
# curl -L https://npmmirror.com/mirrors/electron-builder-binaries/winCodeSign-2.6.0/winCodeSign-2.6.0.7z -o winCodeSign.7z
# 7z x winCodeSign.7z -oC:\Users\runneradmin\AppData\Local\electron-builder\Cache\winCodeSign\winCodeSign-2.6.0
# cd C:\Users\runneradmin\AppData\Local\electron-builder\Cache\winCodeSign\winCodeSign-2.6.0\windows-10
# mv x64 arm64
- name: Make sure that we can sign OpenCOR (Windows ARM only)
if: ${{ matrix.name == 'Windows (ARM)' }}
run: |
curl -L https://npmmirror.com/mirrors/electron-builder-binaries/winCodeSign-2.6.0/winCodeSign-2.6.0.7z -o winCodeSign.7z
7z x winCodeSign.7z -oC:\Users\runneradmin\AppData\Local\electron-builder\Cache\winCodeSign\winCodeSign-2.6.0
cd C:\Users\runneradmin\AppData\Local\electron-builder\Cache\winCodeSign\winCodeSign-2.6.0\windows-10
mv x64 arm64
- name: Install libopenjp2-tools (Linux ARM only)
if: ${{ matrix.name == 'Linux (ARM)' }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions bun.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@types/plotly.js": "3.0.3",
"@vitejs/plugin-vue": "^6.0.3",
"@vue/tsconfig": "^0.8.1",
"@wasm-fmt/clang-format": "^21.1.6",
"@wasm-fmt/clang-format": "^21.1.7",
"autoprefixer": "^10.4.23",
"cmake-js": "^7.4.0",
"electron": "^38.7.2",
Expand Down Expand Up @@ -393,7 +393,7 @@

"@vueuse/shared": ["@vueuse/shared@12.8.2", "", { "dependencies": { "vue": "^3.5.13" } }, "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w=="],

"@wasm-fmt/clang-format": ["@wasm-fmt/clang-format@21.1.6", "", { "bin": { "clang-format": "clang-format-cli.cjs", "git-clang-format": "git-clang-format", "clang-format-diff": "clang-format-diff.py" } }, "sha512-vyYxRkOFOsNJGrI1u2TbWBPc2hzUExYwkEx1N/x+lNUlweOmW8fb9VANQMlPjYBHa8oIsPxxyTZJDZj6f7lw8Q=="],
"@wasm-fmt/clang-format": ["@wasm-fmt/clang-format@21.1.7", "", { "bin": { "clang-format": "clang-format-cli.cjs", "git-clang-format": "git-clang-format", "clang-format-diff": "clang-format-diff.py" } }, "sha512-00pPQzGvY0MfjfUMnoNtod0fRviz9WEU7A3pUb9XSaXek11f2iiamJvzpESxWyvRohxqxwLA8wNJ+Bakd3KCkg=="],

"@xmldom/xmldom": ["@xmldom/xmldom@0.8.11", "", {}, "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw=="],

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"url": "git+https://github.com/opencor/webapp.git"
},
"type": "module",
"version": "0.20251218.0",
"version": "0.20251222.0",
"scripts": {
"archive:web": "bun src/renderer/scripts/archive.web.js",
"build": "electron-vite build",
Expand Down Expand Up @@ -68,7 +68,7 @@
"@types/plotly.js": "3.0.3",
"@vitejs/plugin-vue": "^6.0.3",
"@vue/tsconfig": "^0.8.1",
"@wasm-fmt/clang-format": "^21.1.6",
"@wasm-fmt/clang-format": "^21.1.7",
"autoprefixer": "^10.4.23",
"cmake-js": "^7.4.0",
"electron": "^38.7.2",
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"./style.css": "./dist/opencor.css"
},
"version": "0.20251218.0",
"version": "0.20251222.0",
"scripts": {
"build": "vite build",
"build:lib": "vite build --config vite.lib.config.ts && cp index.d.ts dist/index.d.ts",
Expand Down