From 5d5c3deacc70c0a847db6deae1fa34e27981163c Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 30 Sep 2020 15:16:29 +0200 Subject: [PATCH 1/9] Bump version to 0.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1e0dfbc2..41336bd5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unipept-desktop", - "version": "0.2.2", + "version": "0.3.0", "private": true, "author": "Unipept Team (Ghent University)", "description": "A desktop equivalent of unipept.ugent.be. This app aims at high-throughput analysis of metaproteomics samples.", From d14efef8c8c3271b95d2498974dabcb713c15f10 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 30 Sep 2020 16:43:50 +0200 Subject: [PATCH 2/9] Hopefully fix patch package on Windows OS --- .github/workflows/publish.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7e4584fe..c9fe2015 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,13 +10,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, windows-latest] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 - name: Install dependencies run: npm install + - if: matrix.os == 'windows-latest' + run: Get-ChildItem -File | Foreach {"TYPE $_ | MORE /P > $_" | cmd} + shell: powershell - name: Patch dependencies run: npx patch-package - name: Build application for ${{ matrix.os }} From c290272dd8201d2ca391f8ae5853306828ae27e2 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 30 Sep 2020 16:46:18 +0200 Subject: [PATCH 3/9] Hopefully fix patch package on Windows OS --- .github/workflows/publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c9fe2015..2ed22260 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,11 +15,11 @@ jobs: steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 + - if: matrix.os == 'windows-latest' + run: cd patches; Get-ChildItem -File | Foreach {"TYPE $_ | MORE /P > $_" | cmd} + shell: powershell - name: Install dependencies run: npm install - - if: matrix.os == 'windows-latest' - run: Get-ChildItem -File | Foreach {"TYPE $_ | MORE /P > $_" | cmd} - shell: powershell - name: Patch dependencies run: npx patch-package - name: Build application for ${{ matrix.os }} From 08bdee5550ad49d35b8ee2899ba4f66c77f2c1e0 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 30 Sep 2020 16:49:33 +0200 Subject: [PATCH 4/9] Fix multiple commands --- .github/workflows/publish.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2ed22260..376446e0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,10 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 - if: matrix.os == 'windows-latest' - run: cd patches; Get-ChildItem -File | Foreach {"TYPE $_ | MORE /P > $_" | cmd} + run: | + cd patches + Get-ChildItem -File | Foreach {"TYPE $_ | MORE /P > $_" | cmd} + cd .. shell: powershell - name: Install dependencies run: npm install From 8e45193d357ffd9e13a9974db65313ae3791e296 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 30 Sep 2020 16:50:18 +0200 Subject: [PATCH 5/9] Fix multiple commands --- .github/workflows/publish.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 376446e0..8bad6d61 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,11 +16,11 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 - if: matrix.os == 'windows-latest' - run: | - cd patches - Get-ChildItem -File | Foreach {"TYPE $_ | MORE /P > $_" | cmd} - cd .. - shell: powershell + run: | + cd patches + Get-ChildItem -File | Foreach {"TYPE $_ | MORE /P > $_" | cmd} + cd .. + shell: powershell - name: Install dependencies run: npm install - name: Patch dependencies From 39c419a3bb4f61419814b26caa3e637b253fc339 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 30 Sep 2020 17:00:36 +0200 Subject: [PATCH 6/9] Fix unknown command TYPE --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8bad6d61..0c993f0c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,9 +18,10 @@ jobs: - if: matrix.os == 'windows-latest' run: | cd patches - Get-ChildItem -File | Foreach {"TYPE $_ | MORE /P > $_" | cmd} + TYPE better-sqlite3+7.0.1.patch | MORE /P better-sqlite3+7.0.1.patch + TYPE bindings+1.5.0.patch | MORE /P bindings+1.5.0.patch cd .. - shell: powershell + shell: cmd - name: Install dependencies run: npm install - name: Patch dependencies From 62724c6453531a560c0d293698b09219a3d1053c Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 30 Sep 2020 17:03:45 +0200 Subject: [PATCH 7/9] Forgot > --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0c993f0c..29f0db5b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,8 +18,8 @@ jobs: - if: matrix.os == 'windows-latest' run: | cd patches - TYPE better-sqlite3+7.0.1.patch | MORE /P better-sqlite3+7.0.1.patch - TYPE bindings+1.5.0.patch | MORE /P bindings+1.5.0.patch + TYPE better-sqlite3+7.0.1.patch | MORE /P > better-sqlite3+7.0.1.patch + TYPE bindings+1.5.0.patch | MORE /P > bindings+1.5.0.patch cd .. shell: cmd - name: Install dependencies From e1e27c2a065665ff46bd0b880ef4eace7b952c80 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Mon, 5 Oct 2020 15:24:24 +0200 Subject: [PATCH 8/9] Remove Threads plugin --- vue.config.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vue.config.js b/vue.config.js index 2161d2fa..5670ab1b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,3 @@ -const ThreadsPlugin = require("threads-plugin") -const NodeTargetPlugin = require("webpack/lib/node/NodeTargetPlugin"); const webpack = require("webpack"); module.exports = { @@ -37,9 +35,6 @@ module.exports = { }, configureWebpack:{ plugins: [ - // new ThreadsPlugin({ - // plugins: [new NodeTargetPlugin()] - // }), new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }) From be84512689d7ec687e7b5b19d7db48b87963f451 Mon Sep 17 00:00:00 2001 From: Pieter Verschaffelt Date: Wed, 7 Oct 2020 14:41:00 +0200 Subject: [PATCH 9/9] Bump version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6255769e..664e7835 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unipept-desktop", - "version": "0.4.1", + "version": "0.5.0", "private": true, "author": "Unipept Team (Ghent University)", "description": "A desktop equivalent of unipept.ugent.be. This app aims at high-throughput analysis of metaproteomics samples.",