Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthme
matthme committed Apr 15, 2024
2 parents 9538e1f + a6660cf commit 06b8d36
Show file tree
Hide file tree
Showing 14 changed files with 354 additions and 348 deletions.
56 changes: 28 additions & 28 deletions .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ jobs:
$LkPath = Get-Command lair-keystore | Select-Object -ExpandProperty Definition
Copy-Item $LkPath -Destination src-tauri/bins/lair-keystore-v0.4.2-x86_64-pc-windows-msvc.exe
cargo install holochain --version 0.2.6 --locked --features sqlite-encrypted
cargo install holochain --version 0.2.7 --locked --features sqlite-encrypted
$HcPath = Get-Command holochain | Select-Object -ExpandProperty Definition
Copy-Item $HcPath -Destination src-tauri/bins/holochain-v0.2.6-x86_64-pc-windows-msvc.exe
Copy-Item $HcPath -Destination src-tauri/bins/holochain-v0.2.7-x86_64-pc-windows-msvc.exe
# NEW_VERSION: install new holochain version and copy its binary to the tauri path
Expand All @@ -61,9 +61,9 @@ jobs:
LAIR_PATH=$(which lair-keystore)
cp $LAIR_PATH src-tauri/bins/lair-keystore-v0.4.2-x86_64-apple-darwin
cargo install holochain --version 0.2.6 --locked --features sqlite-encrypted
cargo install holochain --version 0.2.7 --locked --features sqlite-encrypted
HOLOCHAIN_PATH=$(which holochain)
cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.2.6-x86_64-apple-darwin
cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.2.7-x86_64-apple-darwin
# NEW_VERSION: install new holochain version and copy its binary to the tauri path
Expand Down Expand Up @@ -91,9 +91,9 @@ jobs:
cp $LAIR_PATH src-tauri/bins/lair-keystore-v0.4.2-x86_64-unknown-linux-gnu
cargo install holochain --version 0.2.6 --locked --features sqlite-encrypted
cargo install holochain --version 0.2.7 --locked --features sqlite-encrypted
HOLOCHAIN_PATH=$(which holochain)
cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.2.6-x86_64-unknown-linux-gnu
cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.2.7-x86_64-unknown-linux-gnu
# NEW_VERSION: install new holochain version and copy its binary to the tauri path
Expand Down Expand Up @@ -130,40 +130,40 @@ jobs:
# NEW_VERSION change version number in filenames here wherever needed
# log hashes before and after code signing to verify that the uploaded assets are the right ones
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi.zip" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi.zip.sig" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.exe" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.nsis.zip" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.nsis.zip.sig" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi.zip" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi.zip.sig" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.exe" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.nsis.zip" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.nsis.zip.sig" SHA256
dotnet tool install --global AzureSignTool
# sign the .msi file
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 "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi"
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 "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi"
# sign the .exe file
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 "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.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 "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.exe"
# remove the .msi.zip, .msi.zip.sig, nsis.zip and nsis.zip.sig files generated by tauri's build command as they are not code signed
rm "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi.zip"
rm "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi.zip.sig"
rm "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.nsis.zip"
rm "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.nsis.zip.sig"
rm "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi.zip"
rm "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi.zip.sig"
rm "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.nsis.zip"
rm "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.nsis.zip.sig"
# zip and sign the code signed .msi and .exe
7z a -mx=0 "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi.zip" "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi"
npm run tauri signer sign "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi.zip" -- -k ${{ secrets.TAURI_PRIVATE_KEY_0_2 }} -p "${{ secrets.TAURI_KEY_PASSWORD }}"
7z a -mx=0 "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi.zip" "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi"
npm run tauri signer sign "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi.zip" -- -k ${{ secrets.TAURI_PRIVATE_KEY_0_2 }} -p "${{ secrets.TAURI_KEY_PASSWORD }}"
7z a -mx=0 "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.nsis.zip" "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.exe"
npm run tauri signer sign "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.nsis.zip" -- -k ${{ secrets.TAURI_PRIVATE_KEY_0_2 }} -p "${{ secrets.TAURI_KEY_PASSWORD }}"
7z a -mx=0 "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.nsis.zip" "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.exe"
npm run tauri signer sign "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.nsis.zip" -- -k ${{ secrets.TAURI_PRIVATE_KEY_0_2 }} -p "${{ secrets.TAURI_KEY_PASSWORD }}"
# log hashes before and after code signing to verify that the uploaded assets are the right ones
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi.zip" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.5_x64_en-US.msi.zip.sig" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.exe" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.nsis.zip" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.5_x64-setup.nsis.zip.sig" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi.zip" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\msi\Holochain Launcher Beta 2_0.11.6_x64_en-US.msi.zip.sig" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.exe" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.nsis.zip" SHA256
CertUtil -hashfile "D:\a\launcher\launcher\target\release\bundle\nsis\Holochain Launcher Beta 2_0.11.6_x64-setup.nsis.zip.sig" SHA256
env:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY_0_2 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ jobs:
cp $LAIR_PATH src-tauri/bins/lair-keystore-v0.4.2-x86_64-unknown-linux-gnu
cargo install holochain --version 0.2.6 --locked --features sqlite-encrypted
cargo install holochain --version 0.2.7 --locked --features sqlite-encrypted
HOLOCHAIN_PATH=$(which holochain)
cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.2.6-x86_64-unknown-linux-gnu
cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.2.7-x86_64-unknown-linux-gnu
# NEW_VERSION: install new holochain version and copy its binary to the tauri path
Expand Down
Loading

0 comments on commit 06b8d36

Please sign in to comment.