Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
matthme committed May 24, 2024
2 parents 7ae7dbd + bfed8af commit ba295f9
Show file tree
Hide file tree
Showing 125 changed files with 17,312 additions and 4,996 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/publish-happ.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install and test
run: |
nix-store --gc
nix develop --command bash -c "yarn build:happ"
nix develop --command bash -c "holochain --version && yarn build:happ"
- name: Retrieve version
run: |
Expand All @@ -44,9 +44,9 @@ jobs:
uses: ncipollo/release-action@v1
with:
allowUpdates: true
artifacts: 'workdir/we.happ'
artifacts: 'workdir/group.happ'
body: 'See assets below to download and install this version.'
name: We happ v${{ steps.version.outputs.APP_VERSION }}-holochain-0.3.0-beta-dev.42-1ddfd2d
tag: we-alpha-happ-v${{ steps.version.outputs.APP_VERSION }}
name: Group happ v${{ steps.version.outputs.APP_VERSION }}-holochain-0.4.0-dev.4
tag: group-happ-v${{ steps.version.outputs.APP_VERSION }}
prerelease: true
draft: true
17 changes: 7 additions & 10 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,8 @@ jobs:
id: version
shell: bash

- name: install Rust stable
uses: actions-rs/toolchain@v1
with:
override: true
toolchain: stable
- name: install Rust
uses: dtolnay/[email protected]

- name: install Go stable
uses: actions/setup-go@v4
Expand All @@ -57,7 +54,7 @@ jobs:
mkdir resources/default-apps
mkdir resources/bins
yarn setup:release
curl -L --output resources/default-apps/we.happ https://github.com/lightningrodlabs/we/releases/download/we-alpha-happ-v0.11.0/we.happ
curl -L --output resources/default-apps/group.happ https://github.com/lightningrodlabs/we/releases/download/group-happ-v0.12.0-dev.0/group.happ
- name: Build zomes
run: |
Expand Down Expand Up @@ -98,12 +95,12 @@ jobs:
# # Sign the .exe file
# dotnet tool install --global --version 4.0.1 AzureSignTool
# echo "sha512 before code signing"
# CertUtil -hashfile "dist/org.lightningrodlabs.we-electron-alpha-${{ steps.version.outputs.APP_VERSION }}-setup.exe" SHA512
# 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 "dist/org.lightningrodlabs.we-electron-alpha-${{ steps.version.outputs.APP_VERSION }}-setup.exe"
# CertUtil -hashfile "dist/org.lightningrodlabs.moss-0.12-${{ steps.version.outputs.APP_VERSION }}-setup.exe" SHA512
# 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 "dist/org.lightningrodlabs.moss-0.12-${{ steps.version.outputs.APP_VERSION }}-setup.exe"
# echo "sha512 after code signing"
# CertUtil -hashfile "dist/org.lightningrodlabs.we-electron-alpha-${{ steps.version.outputs.APP_VERSION }}-setup.exe" SHA512
# CertUtil -hashfile "dist/org.lightningrodlabs.moss-0.12-${{ steps.version.outputs.APP_VERSION }}-setup.exe" SHA512
# # Overwrite the latest.yml one with one containing the sha512 of the code signed .exe file
# node ./scripts/latest-yaml.js
# gh release upload "latest.yml" "latest.yml" --clobber
# gh release upload "we-alpha-v${{ steps.version.outputs.APP_VERSION }}" "dist/org.lightningrodlabs.we-electron-alpha-${{ steps.version.outputs.APP_VERSION }}-setup.exe" --clobber
# gh release upload "we-alpha-v${{ steps.version.outputs.APP_VERSION }}" "dist/org.lightningrodlabs.moss-0.12-${{ steps.version.outputs.APP_VERSION }}-setup.exe" --clobber
Loading

0 comments on commit ba295f9

Please sign in to comment.