From 5d9da2eb453ca95da497bb8a9652bfb666278fca Mon Sep 17 00:00:00 2001 From: Jonas Lukasczyk Date: Tue, 18 Jun 2024 15:21:19 +0200 Subject: [PATCH] v0.0.35 --- .github/workflows/build.yml | 52 ++++++++++++++++++++++++++++++++----- electron-builder.config.cjs | 3 ++- package.json | 6 +++-- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2fd4a6ce..e27da8a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,12 +7,52 @@ on: workflow_dispatch: jobs: - release: - runs-on: ${{ matrix.os }} + release-win: + runs-on: windows-latest - strategy: - matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + with: + submodules: 'true' + + - name: Install Node.js, NPM and Yarn + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Install Dependencies + run: 'npm install' + + - name: Build + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: 'npm run publish:win' + + release-mac: + runs-on: macos-latest + + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + with: + submodules: 'true' + + - name: Install Node.js, NPM and Yarn + uses: actions/setup-node@v4 + with: + node-version: 20 + + - name: Install Dependencies + run: 'npm install' + + - name: Build + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: 'npm run publish:mac' + + release-lnx: + runs-on: ubuntu-latest steps: - name: Check out Git repository @@ -31,4 +71,4 @@ jobs: - name: Build env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: 'npm run publish' + run: 'npm run publish:lnx' diff --git a/electron-builder.config.cjs b/electron-builder.config.cjs index 72eac104..1750dc69 100644 --- a/electron-builder.config.cjs +++ b/electron-builder.config.cjs @@ -17,7 +17,8 @@ const config = { }, mac: { "extraResources": ['git-binaries/mac'], - "target": ["dmg"] + "target": ["dmg"], + "x64ArchFiles": "*" }, linux: { "target": ["AppImage"] diff --git a/package.json b/package.json index 5d8bc1cc..340946b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ARCitect", - "version": "v0.0.33", + "version": "v0.0.35", "author": "nfdi4plants.org", "description": "Tool to edit Annotated Research Contexts (ARCs).", "private": true, @@ -18,7 +18,9 @@ "compile": "cross-env MODE=production npm run build && electron-builder build --config electron-builder.config.cjs", "compilew": "cross-env MODE=production npm run build && electron-builder build --config electron-builder.config.cjs --win", "compilem": "cross-env MODE=production npm run build && electron-builder build --config electron-builder.config.cjs --mac", - "publish": "cross-env MODE=production npm run build && electron-builder build --config electron-builder.config.cjs --publish always", + "publish:win": "cross-env MODE=production npm run build && electron-builder build --config electron-builder.config.cjs --publish always", + "publish:mac": "cross-env MODE=production npm run build && electron-builder build --universal --config electron-builder.config.cjs --publish always", + "publish:lnx": "cross-env MODE=production npm run build && electron-builder build --config electron-builder.config.cjs --publish always", "start": "node scripts/debug.js", "lint": "eslint . --ext js,ts,vue", "typecheck:main": "tsc --noEmit -p packages/main/tsconfig.json",