diff --git a/.circleci/config.yml b/.circleci/config.yml index c23b654..0e49799 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,10 +1,10 @@ version: 2 step-install: &step-install - run: npm i + run: yarn install step-build: &step-build - run: npm run build + run: yarn build filter-tag: &filter-tag tags: @@ -22,7 +22,7 @@ jobs: steps: - checkout - *step-install - - run: npm run lint + - run: yarn lint build-win-linux: environment: GH_TOKEN: $GH_TOKEN @@ -33,7 +33,7 @@ jobs: - checkout - *step-install - *step-build - - run: npx electron-builder --win --linux --x64 --ia32 -p always + - run: yarn dist:win-linux-publish workflows: version: 2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..2654a5d --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,27 @@ +name: Publish electron + +on: + push: + tags: v* + +jobs: + build: + environment: Publish + runs-on: macos-10.15 + + steps: + - run: echo $GH_TOKEN + - uses: actions/checkout@v2 + - name: Use Node.js 14.x + uses: actions/setup-node@v2 + with: + node-version: 14.x + cache: 'yarn' + - name: Install + run: yarn install + - name: Build + run: yarn build + - name: Package and publish + run: yarn dist:gh-publish + env: + GH_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/package.json b/package.json index bf90a0c..8250880 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,8 @@ "dist:linux": "yarn install && yarn build && electron-builder build --linux --x64", "dist:mac": "yarn install && yarn build && electron-builder build --mac --x64", "dist:mac-publish": "electron-builder build --mac --x64 -p always", - "dist:win-linux-publish": "electron-builder build --win --linux --ia32 --x64 -p always", + "dist:linux-publish": "electron-builder build --linux --x64 --ia32 -p always", + "dist:win-publish": "electron-builder build --win --ia32 --x64 -p always", "dist:gh-publish": "yarn install && yarn build && yarn dist:win-linux-publish && yarn dist:mac-publish", "electron-dev": "cross-env ELECTRON_START_URL=http://localhost:3200 electron .", "electron:debug-analytics": "cross-env ELECTRON_START_URL=http://localhost:3200 DEBUG=universal-analytics electron .",