Skip to content

Commit

Permalink
fix: Merge pull request #292 from UniversalDataTool/buildtest/fix-path
Browse files Browse the repository at this point in the history
retries on desktop app, fix build command
  • Loading branch information
seveibar authored Sep 4, 2020
2 parents 08128b4 + b8771c7 commit 4f761c7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ on:
push:
branches:
- master
- 'buildtest/**'
- "buildtest/**"

jobs:
build:
# if: "contains(github.event.head_commit.message, 'chore(release)') || contains(github.ref, 'buildtest')"
if: "contains(github.event.head_commit.message, 'chore(release)') || contains(github.ref, 'buildtest')"
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
Expand All @@ -32,10 +33,18 @@ jobs:
# if: contains(github.ref, "v0.")
with:
github_token: ${{ secrets.github_token }}
max_attempts: 2
build_script_name: "build:desktop"
mac_certs: ${{ secrets.mac_certs }}
mac_certs_password: ${{ secrets.mac_certs_password }}
release: true
env:
# macOS notarization API key
API_KEY_ID: ${{ secrets.api_key_id }}
API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
- name: Upload Artifacts
if: "contains(github.ref, 'buildtest')"
uses: actions/upload-artifact@v2
with:
name: ${{matrix.os}}.dist
path: dist
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"build:vanilla": "parcel build -d ./lib -o vanilla.js ./src/vanilla/index.js",
"build:vanilla:dev": "parcel ./src/vanilla/index.js",
"build:web": "rimraf build && react-scripts build && cp -r build ./build-copy && mv build-copy build/app",
"build:desktop": "cross-env REACT_APP_DESKTOP=true PUBLIC_URL=. react-scripts build && electron-builder build && cp ./desktop/entitlements.mac.plist ./build/entitlements.mac.plist",
"build:desktop": "cross-env REACT_APP_DESKTOP=true PUBLIC_URL=./ react-scripts build && electron-builder build && cp ./desktop/entitlements.mac.plist ./build/entitlements.mac.plist",
"start:desktop": "cross-env BROWSER=none USE_DEV_SERVER=yes concurrently 'npm run start' 'electron ./desktop'",
"start:desktop:build": "electron ./desktop",
"postinstall:desktop": "electron-builder install-app-deps",
Expand Down

0 comments on commit 4f761c7

Please sign in to comment.