diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..10e0e33 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,101 @@ +name: Publish hostd + +on: + push: + branches: + - master + tags: + - 'v[0-9]+.[0-9]+.[0-9]+' + - 'v[0-9]+.[0-9]+.[0-9]+-**' + +jobs: + windows: + strategy: + matrix: + app: [ hostd, renterd ] + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + - uses: actions/setup-go@v3 + with: + go-version: 'stable' + - name: Setup + shell: bash + run: | + go install github.com/wailsapp/wails/v2/cmd/wails@latest + dotnet tool install --global AzureSignTool + - name: Build + shell: bash + run: | + cd ${{ matrix.app }} + wails build -webview2 embed + 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 "build/bin/${{ matrix.app }} Desktop.exe" + - name: Upload + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.app }} + path: ${{ matrix.app }}/build/bin/ + mac: + strategy: + matrix: + app: [ hostd, renterd ] + runs-on: macos-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + - uses: actions/setup-go@v3 + with: + go-version: 'stable' + - name: Setup + env: + APPLE_CERT_ID: ${{ secrets.APPLE_CERT_ID }} + APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }} + APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }} + APPLE_KEY_B64: ${{ secrets.APPLE_KEY_B64 }} + APPLE_CERT_B64: ${{ secrets.APPLE_CERT_B64 }} + APPLE_CERT_PASSWORD: ${{ secrets.APPLE_CERT_PASSWORD }} + APPLE_KEYCHAIN_PASSWORD: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} + run: | + # extract apple cert + APPLE_CERT_PATH=$RUNNER_TEMP/apple_cert.p12 + KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db + echo -n "$APPLE_CERT_B64" | base64 --decode --output $APPLE_CERT_PATH + + # extract apple key + mkdir -p ~/private_keys + APPLE_API_KEY_PATH=~/private_keys/AuthKey_$APPLE_API_KEY.p8 + echo -n "$APPLE_KEY_B64" | base64 --decode --output $APPLE_API_KEY_PATH + + # create temp keychain + security create-keychain -p "$APPLE_KEYCHAIN_PASSWORD" $KEYCHAIN_PATH + security default-keychain -s $KEYCHAIN_PATH + security set-keychain-settings -lut 21600 $KEYCHAIN_PATH + security unlock-keychain -p "$APPLE_KEYCHAIN_PASSWORD" $KEYCHAIN_PATH + + # import keychain + security import $APPLE_CERT_PATH -P $APPLE_CERT_PASSWORD -A -t cert -f pkcs12 -k $KEYCHAIN_PATH + security find-identity -v $KEYCHAIN_PATH -p codesigning + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $APPLE_KEYCHAIN_PASSWORD $KEYCHAIN_PATH + + go install github.com/wailsapp/wails/v2/cmd/wails@latest + - name: Build amd64 + env: + APPLE_CERT_ID: ${{ secrets.APPLE_CERT_ID }} + APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }} + APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }} + APPLE_KEY_B64: ${{ secrets.APPLE_KEY_B64 }} + APPLE_CERT_B64: ${{ secrets.APPLE_CERT_B64 }} + APPLE_CERT_PASSWORD: ${{ secrets.APPLE_CERT_PASSWORD }} + APPLE_KEYCHAIN_PASSWORD: ${{ secrets.APPLE_KEYCHAIN_PASSWORD }} + run: | + cd ${{ matrix.app }} + wails build - + /usr/bin/codesign --deep -f -v --timestamp -o runtime,library -s $APPLE_CERT_ID "build/bin/${{ matrix.app }} Desktop.app/Contents/MacOS/${{ matrix.app }} Desktop" + xcrun notarytool submit -k ~/private_keys/AuthKey_$APPLE_API_KEY.p8 -d $APPLE_API_KEY -i $APPLE_API_ISSUER --wait --timeout 10m build/bin/${{ matrix.app }} Desktop.app + - name: Upload + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.app }} + path: ${{ matrix.app }}/build/bin/ + diff --git a/.gitignore b/.gitignore index fbe82c7..8378190 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ dist bin node_modules +.DS_Store \ No newline at end of file diff --git a/hostd/frontend/wailsjs/go/main/App.d.ts b/hostd/frontend/wailsjs/go/main/App.d.ts index 2d966b9..cb09c6b 100755 --- a/hostd/frontend/wailsjs/go/main/App.d.ts +++ b/hostd/frontend/wailsjs/go/main/App.d.ts @@ -1,6 +1,6 @@ // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT -import {main} from '../models'; +import {config} from '../models'; export function DownloadRelease():Promise; @@ -12,6 +12,6 @@ export function NeedsDownload():Promise; export function OpenBrowser(arg1:string):Promise; -export function SaveConfig(arg1:main.Config):Promise; +export function SaveConfig(arg1:config.Config):Promise; export function Start():Promise; diff --git a/hostd/wails.json b/hostd/wails.json index 140dd9b..84f050a 100644 --- a/hostd/wails.json +++ b/hostd/wails.json @@ -1,11 +1,16 @@ { "$schema": "https://wails.io/schemas/config.v2.json", - "name": "desktop", - "outputfilename": "desktop", + "name": "hostd Desktop", + "outputfilename": "hostd", "frontend:install": "npm install", "frontend:build": "npm run build", "frontend:dev:watcher": "npm run dev", "frontend:dev:serverUrl": "auto", + "info": { + "companyName": "Sia Foundation", + "productName": "hostd desktop", + "productVersion": "0.0.1" + }, "author": { "name": "Sia Foundation", "email": "hi@sia.tech" diff --git a/renterd/wails.json b/renterd/wails.json index 140dd9b..9867564 100644 --- a/renterd/wails.json +++ b/renterd/wails.json @@ -6,6 +6,11 @@ "frontend:build": "npm run build", "frontend:dev:watcher": "npm run dev", "frontend:dev:serverUrl": "auto", + "info": { + "companyName": "Sia Foundation", + "productName": "renterd desktop", + "productVersion": "0.0.1" + }, "author": { "name": "Sia Foundation", "email": "hi@sia.tech"