Skip to content

Commit

Permalink
fix: Merge pull request #287 from UniversalDataTool/buildtest/win
Browse files Browse the repository at this point in the history 
Update & Fix Build System
  • Loading branch information
@seveibar
seveibar committed Sep 3, 2020
2 parents 1bcfab4 + d2e6e98 commit 51a9427
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 83 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build-desktop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ on:
push:
branches:
- master
- 'buildtest/**'

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

strategy:
Expand All @@ -16,6 +17,9 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Install with long network timeout
run: |
yarn install --network-timeout 1000000
- name: Prepare for app notarization
if: startsWith(matrix.os, 'macos')
# Import Apple API key for app notarization on macOS
Expand All @@ -24,7 +28,7 @@ jobs:
echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
# Helpful reference https://github.com/samuelmeuli/mini-diary/blob/master/.github/workflows/release.yml
- name: Electron Builder Action
uses: samuelmeuli/action-electron-builder@v1.3.0
uses: samuelmeuli/action-electron-builder@v1
# if: contains(github.ref, "v0.")
with:
github_token: ${{ secrets.github_token }}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"cypress-file-upload": "^4.0.6",
"cypress-image-snapshot": "^3.1.1",
"electron": "^8.0.0",
"electron-builder": "^22.3.2",
"electron-builder": "^22.8.0",
"electron-builder-notarize": "^1.1.2",
"gh-pages": "^2.1.1",
"material-survey": "^1.0.32",
Expand Down
11 changes: 0 additions & 11 deletions src/components/DatasetEditor/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import LabelView from "../LabelView"
import useIsLabelOnlyMode from "../../utils/use-is-label-only-mode"
import { HotKeys } from "react-hotkeys"
import { useHotkeyStorage } from "../HotkeyStorage"
import RawJSONEditor from "../RawJSONEditor"

import "brace/mode/javascript"
import "brace/theme/github"
Expand Down Expand Up @@ -146,18 +145,8 @@ export default ({
tabs={headerTabs}
/>
<div style={{ height: "100%", overflowY: "scroll" }}>
{mode === "json" && (
<RawJSONEditor
content={dataset}
onSave={(newDataset) => {
onChangeDataset(newDataset)
changeMode("setup")
}}
/>
)}
{mode === "setup" && (
<SetupPage
onClickEditJSON={() => changeMode("json")}
dataset={dataset}
onClearLabelData={() => {
onChangeDataset(
Expand Down
124 changes: 55 additions & 69 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4615,23 +4615,23 @@ app-builder-bin@3.5.9:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.9.tgz#a3ac0c25286bac68357321cb2eaf7128b0bc0a4f"
integrity sha512-NSjtqZ3x2kYiDp3Qezsgukx/AUzKPr3Xgf9by4cYt05ILWGAptepeeu0Uv+7MO+41o6ujhLixTou8979JGg2Kg==

app-builder-lib@22.7.0:
version "22.7.0"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.7.0.tgz#ccd3e7ece2d46bc209423a77aa142f74aaf65db0"
integrity sha512-blRKwV8h0ztualXS50ciCTo39tbuDGNS+ldcy8+KLvKXuT6OpYnSJ7M6MSfPT+xWatshMHJV1rJx3Tl+k/Sn/g==
app-builder-lib@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.8.0.tgz#342a8976f50ae35cfd07412dbfd4f6c895b32eac"
integrity sha512-RGaIRjCUrqkmh6QOGsyekQPEOaVynHfmeh8JZuyUymFYUOFdzBbPamkA2nhBVBTkkgfjRHsxK7LhedFKPzvWEQ==
dependencies:
"7zip-bin" "~5.0.3"
"@develar/schema-utils" "~2.6.5"
async-exit-hook "^2.0.1"
bluebird-lst "^1.0.9"
builder-util "22.7.0"
builder-util-runtime "8.7.1"
builder-util "22.8.0"
builder-util-runtime "8.7.2"
chromium-pickle-js "^0.2.0"
debug "^4.2.0"
debug "^4.1.1"
ejs "^3.1.3"
electron-publish "22.7.0"
fs-extra "^9.0.0"
hosted-git-info "^3.0.4"
electron-publish "22.8.0"
fs-extra "^9.0.1"
hosted-git-info "^3.0.5"
is-ci "^2.0.0"
isbinaryfile "^4.0.6"
js-yaml "^3.14.0"
Expand Down Expand Up @@ -5923,28 +5923,28 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"

builder-util-runtime@8.7.1:
version "8.7.1"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.1.tgz#23c808cddd650d4376a7a1518ec1e80e85c10f00"
integrity sha512-uEBH1nAnTvzjcsrh2XI3qOzJ39h0+9kuIuwj+kCc3a07TZNGShfJcai8fFzL3mNgGjEFxoq+XMssR11r+FOFSg==
builder-util-runtime@8.7.2:
version "8.7.2"
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA==
dependencies:
debug "^4.2.0"
debug "^4.1.1"
sax "^1.2.4"

builder-util@22.7.0:
version "22.7.0"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.7.0.tgz#0776a66e6d6e408a78bed7f17a7ad22516d9e7f0"
integrity sha512-UV3MKL0mwjMq2y9JlBf28Cegpj0CrIXcjGkO0TXn+QZ6Yy9rY6lHOuUvpQ19ct2Qh1o+QSwH3Q1nKUf5viJBBg==
builder-util@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.8.0.tgz#01684085d1f2370b1bd182f69cbd007426f63f64"
integrity sha512-H80P1JzVy3TGpi63x81epQDK24XalL034+jAZlrPb5IhLtYmnNNdxCCAVJvg3VjSISd73Y71O+uhqCxWpqbPHw==
dependencies:
"7zip-bin" "~5.0.3"
"@types/debug" "^4.1.5"
"@types/fs-extra" "^9.0.1"
app-builder-bin "3.5.9"
bluebird-lst "^1.0.9"
builder-util-runtime "8.7.1"
chalk "^4.0.0"
debug "^4.2.0"
fs-extra "^9.0.0"
builder-util-runtime "8.7.2"
chalk "^4.1.0"
debug "^4.1.1"
fs-extra "^9.0.1"
is-ci "^2.0.0"
js-yaml "^3.14.0"
source-map-support "^0.5.19"
Expand Down Expand Up @@ -6216,7 +6216,7 @@ chalk@^3.0.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"

chalk@^4.0.0, chalk@^4.1.0:
chalk@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
Expand Down Expand Up @@ -7561,13 +7561,6 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
dependencies:
ms "^2.1.1"

debug@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
dependencies:
ms "2.1.2"

decamelize@^1.1.1, decamelize@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
Expand Down Expand Up @@ -7813,15 +7806,15 @@ dir-glob@^3.0.0, dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"

dmg-builder@22.7.0:
version "22.7.0"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.7.0.tgz#ead7e7c046cbdc52d29d302a4455f6668cdf7d45"
integrity sha512-5Ea2YEz6zSNbyGzZD+O9/MzmaXb6oa15cSKWo4JQ1xP4rorOpte7IOj2jcwYjtc+Los2gu1lvT314OC1OZIWgg==
dmg-builder@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.8.0.tgz#2b17127837ed444db3086317eda5cf8912f6e6a9"
integrity sha512-orePWjcrl97SYLA8F/6UUtbXJSoZCYu5KOP1lVqD4LOomr8bjGDyEVYZmZYcg5WqKmXucdmO6OpqgzH/aRMMuA==
dependencies:
app-builder-lib "22.7.0"
builder-util "22.7.0"
fs-extra "^9.0.0"
iconv-lite "^0.5.1"
app-builder-lib "22.8.0"
builder-util "22.8.0"
fs-extra "^9.0.1"
iconv-lite "^0.6.2"
js-yaml "^3.14.0"
sanitize-filename "^1.6.3"

Expand Down Expand Up @@ -8088,19 +8081,19 @@ electron-builder-notarize@^1.1.2:
js-yaml "^3.14.0"
read-pkg-up "^7.0.0"

electron-builder@^22.3.2:
version "22.7.0"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.7.0.tgz#a42d08a1654ffc2f7d9e2860829d3cc55d4a0c81"
integrity sha512-t6E3oMutpST64YWbZCg7HodEwJOsnjUF1vnDIHm2MW6CFZPX8tlCK6efqaV66LU0E0Nkp/JH6TE5bCqQ1+VdPQ==
electron-builder@^22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.8.0.tgz#d2c9fc5438c834e41fd794a271fca200165a3bad"
integrity sha512-dUv4F3srJouqxhWivtKqSoQP4Df6vYgjooGdzms+iYMTFi9f0b4LlEbr7kgsPvte8zAglee7VOGOODkCRJDkUQ==
dependencies:
"@types/yargs" "^15.0.5"
app-builder-lib "22.7.0"
app-builder-lib "22.8.0"
bluebird-lst "^1.0.9"
builder-util "22.7.0"
builder-util-runtime "8.7.1"
chalk "^4.0.0"
dmg-builder "22.7.0"
fs-extra "^9.0.0"
builder-util "22.8.0"
builder-util-runtime "8.7.2"
chalk "^4.1.0"
dmg-builder "22.8.0"
fs-extra "^9.0.1"
is-ci "^2.0.0"
lazy-val "^1.0.4"
read-config-file "6.0.0"
Expand All @@ -8116,19 +8109,19 @@ electron-notarize@^0.2.0:
debug "^4.1.1"
fs-extra "^8.1.0"

electron-publish@22.7.0:
version "22.7.0"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.7.0.tgz#d92ba7c4007c9ac1dd070593e48028184fb2dc19"
integrity sha512-hmU69xlb6vvAV3QfpHYDlkdZMFdBAgDbptoxbLFrnTq5bOkcL8AaDbvxeoZ4+lvqgs29NwqGpkHo2oN+p/hCfg==
electron-publish@22.8.0:
version "22.8.0"
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.8.0.tgz#7f410fe043abc5d3d896c4ee9eea7a43ea352c7d"
integrity sha512-uM0Zdi9hUqqGOrPj478v7toTvV1Kgto1w11rIiI168batiXAJvNLD8VZRfehOrZT0ibUyZlw8FtxoGCrjyHUOw==
dependencies:
"@types/fs-extra" "^9.0.1"
bluebird-lst "^1.0.9"
builder-util "22.7.0"
builder-util-runtime "8.7.1"
chalk "^4.0.0"
fs-extra "^9.0.0"
builder-util "22.8.0"
builder-util-runtime "8.7.2"
chalk "^4.1.0"
fs-extra "^9.0.1"
lazy-val "^1.0.4"
mime "^2.4.5"
mime "^2.4.6"

electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.488:
version "1.3.506"
Expand Down Expand Up @@ -9460,7 +9453,7 @@ fs-extra@^7.0.0, fs-extra@^7.0.1:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^9.0.0:
fs-extra@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
Expand Down Expand Up @@ -10182,7 +10175,7 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==

hosted-git-info@^3.0.4:
hosted-git-info@^3.0.5:
version "3.0.5"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.5.tgz#bea87905ef7317442e8df3087faa3c842397df03"
integrity sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==
Expand Down Expand Up @@ -10496,13 +10489,6 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
dependencies:
safer-buffer ">= 2.1.2 < 3"

iconv-lite@^0.5.1:
version "0.5.2"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8"
integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag==
dependencies:
safer-buffer ">= 2.1.2 < 3"

iconv-lite@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
Expand Down Expand Up @@ -13211,7 +13197,7 @@ mime@1.6.0:
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==

mime@^2.4.4, mime@^2.4.5:
mime@^2.4.4, mime@^2.4.6:
version "2.4.6"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
Expand Down Expand Up @@ -13419,7 +13405,7 @@ ms@2.1.1:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==

ms@2.1.2, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
Expand Down

0 comments on commit 51a9427

Please sign in to comment.