From b400e52c3433480ec06eaf1208617cf568f24ca3 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:54:32 +0100 Subject: [PATCH 01/47] Attempt github build --- .github/workflows/build.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 000000000..4f6308752 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,20 @@ +on: + push: + branches: [ main ] + tags: + - '*' + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Download node.js + run: wget -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar -xJvf node-v20.10.0-linux-x64.tar.xz -C /usr/local + - name: Install deps + run: npm install + - name: build linux64 release + run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 + - name: build linux32 release + run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 \ No newline at end of file From c432f10f27ec40c89017f8d53c43df2e8ebd2d38 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 13:57:42 +0100 Subject: [PATCH 02/47] Run on pull requests --- .github/workflows/build.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4f6308752..6b5833be4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,9 +1,5 @@ -on: - push: - branches: [ main ] - tags: - - '*' - workflow_dispatch: +on: pull_request + jobs: build: From 8c2a307d88b4a44e8a2f46c57a4dd0a3d3e658b4 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 14:07:10 +0100 Subject: [PATCH 03/47] Small changes --- .github/workflows/build.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6b5833be4..e757753e0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,11 +6,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Install linux packages + run: sudo apt update && sudo apt install wine - name: Download node.js - run: wget -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar -xJvf node-v20.10.0-linux-x64.tar.xz -C /usr/local + run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - name: Install deps run: npm install - name: build linux64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 - name: build linux32 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 \ No newline at end of file + run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 + - name: build win64 release + run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 \ No newline at end of file From 9be46dff6d1d842e08b56835e74dcfea51a1de81 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 14:16:55 +0100 Subject: [PATCH 04/47] add artifacts --- .github/workflows/build.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e757753e0..2ac196b60 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,14 +7,17 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install linux packages - run: sudo apt update && sudo apt install wine + run: sudo apt update && sudo apt install wine win32 - name: Download node.js run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - name: Install deps run: npm install - name: build linux64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 - - name: build linux32 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 - name: build win64 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 \ No newline at end of file + run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: Binaries + path: apps/*.{zip,rpm,deb,pkg,dmg} From 188af6fbddfef40b88aadaf1587f628e2b912922 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 14:18:04 +0100 Subject: [PATCH 05/47] fix deps --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2ac196b60..468adadda 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install linux packages - run: sudo apt update && sudo apt install wine win32 + run: sudo apt-get update && sudo apt-get install wine - name: Download node.js run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - name: Install deps From 383c4fe8c7db850c98a4e1e66306600e70995e5d Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 14:51:51 +0100 Subject: [PATCH 06/47] create apps folder --- .github/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 468adadda..0de8fd8c3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,6 +12,8 @@ jobs: run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - name: Install deps run: npm install + - name: Create apps folder + run: mkdir -p apps - name: build linux64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 - name: build win64 release From d4a87af7253a074ec936c6b4ff52661f24ea770a Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 14:55:52 +0100 Subject: [PATCH 07/47] increase verbosity --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0de8fd8c3..1429fa552 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: - name: Create apps folder run: mkdir -p apps - name: build linux64 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 + run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL - name: build win64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 - name: Upload artifacts From 4443de63c3e61c3f17b546f40afcb13a425a8776 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 15:07:20 +0100 Subject: [PATCH 08/47] List files --- .github/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1429fa552..1445f7c5f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,6 +18,8 @@ jobs: run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL - name: build win64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 + - name: List files + run: ls -lR . - name: Upload artifacts uses: actions/upload-artifact@v3 with: From 2056f79bd570e9dd90dd5023c15579243bea79ca Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 16:36:59 +0100 Subject: [PATCH 09/47] List files --- .github/workflows/build.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1445f7c5f..23ad1a5e6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,11 +14,15 @@ jobs: run: npm install - name: Create apps folder run: mkdir -p apps + - name: List files + run: ls -lR . - name: build linux64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL + - name: List files 2 + run: ls -lR . - name: build win64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 - - name: List files + - name: List files 3 run: ls -lR . - name: Upload artifacts uses: actions/upload-artifact@v3 From 8b1663c358e056aa25e7bbdeb38f786e671a1508 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 16:55:08 +0100 Subject: [PATCH 10/47] List files --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 23ad1a5e6..1b22af4fc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install linux packages - run: sudo apt-get update && sudo apt-get install wine + run: sudo apt-get update && sudo apt-get install wine devscripts sbuild - name: Download node.js run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - name: Install deps @@ -28,4 +28,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: Binaries - path: apps/*.{zip,rpm,deb,pkg,dmg} + path: apps/*.{zip,rpm,deb,pkg,dmg,tar.gz} From 66b45e0e069398487dbce6532ca670224656ff96 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 17:15:22 +0100 Subject: [PATCH 11/47] List files --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1b22af4fc..08d2d4ab9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -17,11 +17,11 @@ jobs: - name: List files run: ls -lR . - name: build linux64 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL + run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer - name: List files 2 run: ls -lR . - name: build win64 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 + run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 --installer - name: List files 3 run: ls -lR . - name: Upload artifacts From d27aadade921318841449d627590217364e37c75 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 17:18:05 +0100 Subject: [PATCH 12/47] Add --installer and rpm deps --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 08d2d4ab9..41884ba65 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -7,7 +7,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Install linux packages - run: sudo apt-get update && sudo apt-get install wine devscripts sbuild + run: sudo apt-get update && sudo apt-get install wine devscripts sbuild rpm - name: Download node.js run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - name: Install deps From a3b8b3883cb7924fa73f6b5f4f87dc2a8ed1e795 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 17:44:36 +0100 Subject: [PATCH 13/47] Split mac build, upload inidividual artifactsx --- .github/workflows/build.yaml | 53 +++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 41884ba65..9583de158 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,12 +20,51 @@ jobs: run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer - name: List files 2 run: ls -lR . - - name: build win64 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 --installer - - name: List files 3 - run: ls -lR . - - name: Upload artifacts + - name: Upload deb + uses: actions/upload-artifact@v3 + with: + name: Deb files + path: apps/*.deb + - name: Upload rpm uses: actions/upload-artifact@v3 with: - name: Binaries - path: apps/*.{zip,rpm,deb,pkg,dmg,tar.gz} + name: Deb files + path: apps/*.rpm + - name: Upload linux binary + uses: actions/upload-artifact@v3 + with: + name: Deb files + path: apps/*.tar.gz + + build-mac: + runs-on: macos-latest + steps: + - uses: actions/checkout@v3 + - name: Install packages + run: brew install nodejs + - name: Download node.js + run: curl -o /tmp/node.pkg https://nodejs.org/dist/v20.10.0/node-v20.10.0.pkg && sudo installer -pkg /tmp/node.pkg -target / + - name: Install deps + run: npm install + - name: Create apps folder + run: mkdir -p apps + - name: List files + run: ls -lR . + - name: build macos release + run: node ./node_modules/gulp/bin/gulp.js release --platform=osx64 -LLLL + - name: List files 2 + run: ls -lR . + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: MacOSX Binary + path: apps/*.zip + + +# build-win: +# runs-on: windows-latest +# steps: +# - uses: actions/checkout@v3 +# - name: Install windows packages +# run: brew install nodejs + From 3b20a85e760088bf483a60adc1b9a6a1e92a2428 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:03:56 +0100 Subject: [PATCH 14/47] Split artifacts --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9583de158..23089bd09 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,17 +23,17 @@ jobs: - name: Upload deb uses: actions/upload-artifact@v3 with: - name: Deb files + name: Configurator deb path: apps/*.deb - name: Upload rpm uses: actions/upload-artifact@v3 with: - name: Deb files + name: Configurator rpm path: apps/*.rpm - name: Upload linux binary uses: actions/upload-artifact@v3 with: - name: Deb files + name: Configurator tar.gz path: apps/*.tar.gz build-mac: From fda8e8e4d76109df08c1358bef686cd0e205886a Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:11:36 +0100 Subject: [PATCH 15/47] Use setup node --- .github/workflows/build.yaml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 23089bd09..ec31fd72a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -5,11 +5,15 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 20 + cache: 'npm' - name: Install linux packages run: sudo apt-get update && sudo apt-get install wine devscripts sbuild rpm - - name: Download node.js - run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local + #- name: Download node.js + # run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - name: Install deps run: npm install - name: Create apps folder @@ -39,13 +43,17 @@ jobs: build-mac: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 20 + cache: 'npm' - name: Install packages run: brew install nodejs - - name: Download node.js - run: curl -o /tmp/node.pkg https://nodejs.org/dist/v20.10.0/node-v20.10.0.pkg && sudo installer -pkg /tmp/node.pkg -target / - - name: Install deps - run: npm install + #- name: Download node.js + # run: curl -o /tmp/node.pkg https://nodejs.org/dist/v20.10.0/node-v20.10.0.pkg && sudo installer -pkg /tmp/node.pkg -target / + #- name: Install deps + # run: npm install - name: Create apps folder run: mkdir -p apps - name: List files From ff4ec500a48f90dc198eb21779bcbf4aa4e2df9b Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:13:04 +0100 Subject: [PATCH 16/47] Use setup node --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ec31fd72a..3ec6b90a9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -52,8 +52,8 @@ jobs: run: brew install nodejs #- name: Download node.js # run: curl -o /tmp/node.pkg https://nodejs.org/dist/v20.10.0/node-v20.10.0.pkg && sudo installer -pkg /tmp/node.pkg -target / - #- name: Install deps - # run: npm install + - name: Install deps + run: npm install - name: Create apps folder run: mkdir -p apps - name: List files From 2c0e5224efe17800fbbec1d6ac98c8331563ec1f Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:30:11 +0100 Subject: [PATCH 17/47] Use setup node --- .github/workflows/build.yaml | 67 ++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3ec6b90a9..ff11c748a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,22 +8,23 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: lts + check-latest: true cache: 'npm' - name: Install linux packages run: sudo apt-get update && sudo apt-get install wine devscripts sbuild rpm #- name: Download node.js # run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - name: Install deps - run: npm install + uses: nick-fields/retry@v2 + with: + max_attempts: 3 + retry_on: error + command: npm install - name: Create apps folder run: mkdir -p apps - - name: List files - run: ls -lR . - name: build linux64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer - - name: List files 2 - run: ls -lR . - name: Upload deb uses: actions/upload-artifact@v3 with: @@ -46,22 +47,23 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: lts + check-latest: true cache: 'npm' - name: Install packages run: brew install nodejs #- name: Download node.js # run: curl -o /tmp/node.pkg https://nodejs.org/dist/v20.10.0/node-v20.10.0.pkg && sudo installer -pkg /tmp/node.pkg -target / - name: Install deps - run: npm install + uses: nick-fields/retry@v2 + with: + max_attempts: 3 + retry_on: error + command: npm install - name: Create apps folder run: mkdir -p apps - - name: List files - run: ls -lR . - name: build macos release run: node ./node_modules/gulp/bin/gulp.js release --platform=osx64 -LLLL - - name: List files 2 - run: ls -lR . - name: Upload artifacts uses: actions/upload-artifact@v3 with: @@ -69,10 +71,39 @@ jobs: path: apps/*.zip -# build-win: -# runs-on: windows-latest -# steps: -# - uses: actions/checkout@v3 -# - name: Install windows packages -# run: brew install nodejs + build-win: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v4 + with: + node-version: lts + check-latest: true + cache: 'npm' + - name: Install deps + uses: nick-fields/retry@v2 + with: + max_attempts: 3 + retry_on: error + command: npm install + - name: build win64 release + run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 -LLLL --installer + - name: Upload msi + uses: actions/upload-artifact@v3 + with: + name: Configurator win64 msi + path: apps/*.msi + - name: Upload exe + uses: actions/upload-artifact@v3 + with: + name: Configurator win64 exe + path: apps/*.exe + - name: Upload zip + uses: actions/upload-artifact@v3 + with: + name: Configurator win64 zip + path: apps/*.zip + + + From 3ec943aa95c071b1ecfdda80b1972aac7d6c4ff8 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:32:05 +0100 Subject: [PATCH 18/47] Add windows --- .github/workflows/build.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ff11c748a..d5069c643 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,7 +9,7 @@ jobs: - uses: actions/setup-node@v4 with: node-version: lts - check-latest: true + check-latest: true cache: 'npm' - name: Install linux packages run: sudo apt-get update && sudo apt-get install wine devscripts sbuild rpm @@ -69,9 +69,7 @@ jobs: with: name: MacOSX Binary path: apps/*.zip - - - build-win: + build-win: runs-on: windows-latest steps: - uses: actions/checkout@v3 From 4390fec3a92255542daf6bf8dc2e1d2651ac21f2 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:34:29 +0100 Subject: [PATCH 19/47] Yaml fixes --- .github/workflows/build.yaml | 64 ++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d5069c643..86a4c6ea1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -69,38 +69,38 @@ jobs: with: name: MacOSX Binary path: apps/*.zip - build-win: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v4 - with: - node-version: lts - check-latest: true - cache: 'npm' - - name: Install deps - uses: nick-fields/retry@v2 - with: - max_attempts: 3 - retry_on: error - command: npm install - - name: build win64 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 -LLLL --installer - - name: Upload msi - uses: actions/upload-artifact@v3 - with: - name: Configurator win64 msi - path: apps/*.msi - - name: Upload exe - uses: actions/upload-artifact@v3 - with: - name: Configurator win64 exe - path: apps/*.exe - - name: Upload zip - uses: actions/upload-artifact@v3 - with: - name: Configurator win64 zip - path: apps/*.zip + build-win: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v4 + with: + node-version: lts + check-latest: true + cache: 'npm' + - name: Install deps + uses: nick-fields/retry@v2 + with: + max_attempts: 3 + retry_on: error + command: npm install + - name: build win64 release + run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 -LLLL --installer + - name: Upload msi + uses: actions/upload-artifact@v3 + with: + name: Configurator win64 msi + path: apps/*.msi + - name: Upload exe + uses: actions/upload-artifact@v3 + with: + name: Configurator win64 exe + path: apps/*.exe + - name: Upload zip + uses: actions/upload-artifact@v3 + with: + name: Configurator win64 zip + path: apps/*.zip From 5143fe1162f59a1441d7352138381be9bb0b1cee Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:37:03 +0100 Subject: [PATCH 20/47] s/lts/20/g --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 86a4c6ea1..d6c3d0e62 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: lts + node-version: 20 check-latest: true cache: 'npm' - name: Install linux packages @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: lts + node-version: 20 check-latest: true cache: 'npm' - name: Install packages @@ -75,7 +75,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v4 with: - node-version: lts + node-version: 20 check-latest: true cache: 'npm' - name: Install deps From e1e8ec81026cc0746d0f563a603a3391b2792cfe Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:39:23 +0100 Subject: [PATCH 21/47] timeout mimnutes --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d6c3d0e62..e55af6523 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,6 +21,7 @@ jobs: max_attempts: 3 retry_on: error command: npm install + timeout_minutes: 10 - name: Create apps folder run: mkdir -p apps - name: build linux64 release @@ -60,6 +61,7 @@ jobs: max_attempts: 3 retry_on: error command: npm install + timeout_minutes: 10 - name: Create apps folder run: mkdir -p apps - name: build macos release @@ -84,6 +86,7 @@ jobs: max_attempts: 3 retry_on: error command: npm install + timeout_minutes: 10 - name: build win64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 -LLLL --installer - name: Upload msi From 53ffb291b7614729b51541c753751adbf256a705 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:52:53 +0100 Subject: [PATCH 22/47] try again --- .github/workflows/build.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e55af6523..d0b5a7082 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,7 +2,7 @@ on: pull_request jobs: - build: + build-linux: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -25,6 +25,12 @@ jobs: - name: Create apps folder run: mkdir -p apps - name: build linux64 release + id: build1 + run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer + continue-on-error: true + - name: build linux64 release 2 + id: build2 + if: steps.build1.outcome == 'failure' run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer - name: Upload deb uses: actions/upload-artifact@v3 From 5f9d70b6f7c1110c5c071ee8ad1e1986efd36a25 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:56:00 +0100 Subject: [PATCH 23/47] try again --- .github/workflows/build.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d0b5a7082..c666a4eba 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,7 +26,12 @@ jobs: run: mkdir -p apps - name: build linux64 release id: build1 - run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer + uses: nick-fields/retry@v2 + with: + max_attempts: 3 + retry_on: error + timeout_minutes: 20 + command: sync && node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer continue-on-error: true - name: build linux64 release 2 id: build2 From 73a9992601b928c2d33cb06632c00a0f727b2b11 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 19:19:01 +0100 Subject: [PATCH 24/47] Artifact names --- .github/workflows/build.yaml | 60 +++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c666a4eba..11b8fb2ce 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,6 +6,22 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Setup environment + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + run: | + # This is the hash of the commit for the PR + # when the action is triggered by PR, empty otherwise + COMMIT_ID=${{ github.event.pull_request.head.sha }} + # This is the hash of the commit when triggered by push + # but the hash of refs/pull//merge, which is different + # from the hash of the latest commit in the PR, that's + # why we try github.event.pull_request.head.sha first + COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} + BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) + VERSION=$(grep version package.json | cut -d: -f2 | sed 's/[",]//g' | awk '{print $1}') + echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV + echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV - uses: actions/setup-node@v4 with: node-version: 20 @@ -40,23 +56,39 @@ jobs: - name: Upload deb uses: actions/upload-artifact@v3 with: - name: Configurator deb + name: ${{ env.BUILD_NAME }} deb path: apps/*.deb - name: Upload rpm uses: actions/upload-artifact@v3 with: - name: Configurator rpm + name: ${{ env.BUILD_NAME }} rpm path: apps/*.rpm - name: Upload linux binary uses: actions/upload-artifact@v3 with: - name: Configurator tar.gz + name: ${{ env.BUILD_NAME }} tar.gz path: apps/*.tar.gz build-mac: runs-on: macos-latest steps: - uses: actions/checkout@v4 + - name: Setup environment + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + run: | + # This is the hash of the commit for the PR + # when the action is triggered by PR, empty otherwise + COMMIT_ID=${{ github.event.pull_request.head.sha }} + # This is the hash of the commit when triggered by push + # but the hash of refs/pull//merge, which is different + # from the hash of the latest commit in the PR, that's + # why we try github.event.pull_request.head.sha first + COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} + BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) + VERSION=$(grep version package.json | cut -d: -f2 | sed 's/[",]//g' | awk '{print $1}') + echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV + echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV - uses: actions/setup-node@v4 with: node-version: 20 @@ -80,12 +112,30 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: MacOSX Binary + name: ${{env.BUILD_NAME}} MacOSX zip path: apps/*.zip + build-win: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - name: Setup environment + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + run: | + # This is the hash of the commit for the PR + # when the action is triggered by PR, empty otherwise + COMMIT_ID=${{ github.event.pull_request.head.sha }} + # This is the hash of the commit when triggered by push + # but the hash of refs/pull//merge, which is different + # from the hash of the latest commit in the PR, that's + # why we try github.event.pull_request.head.sha first + COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} + BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) + VERSION=$(grep version package.json | cut -d: -f2 | sed 's/[",]//g' | awk '{print $1}') + echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV + echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV + - uses: actions/setup-node@v4 with: node-version: 20 From 2aa9fd7299d8de22ba26ed70b744ca432bae5d6f Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 19:27:07 +0100 Subject: [PATCH 25/47] Artifact names --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 11b8fb2ce..3e06192e4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -125,14 +125,14 @@ jobs: run: | # This is the hash of the commit for the PR # when the action is triggered by PR, empty otherwise - COMMIT_ID=${{ github.event.pull_request.head.sha }} + set COMMIT_ID=${{ github.event.pull_request.head.sha }} # This is the hash of the commit when triggered by push # but the hash of refs/pull//merge, which is different # from the hash of the latest commit in the PR, that's # why we try github.event.pull_request.head.sha first - COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} - BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) - VERSION=$(grep version package.json | cut -d: -f2 | sed 's/[",]//g' | awk '{print $1}') + set COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} + set BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) + set VERSION=$(grep version package.json | cut -d: -f2 | sed 's/[",]//g' | awk '{print $1}') echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV From 5dc8e3d41698657709a73f23c9238800687fe00b Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 19:50:27 +0100 Subject: [PATCH 26/47] Windows env --- .github/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3e06192e4..831fd466f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -119,6 +119,8 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 + - name: Install linux utils + run: choco install --force -y awk grep sed - name: Setup environment env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true @@ -132,7 +134,7 @@ jobs: # why we try github.event.pull_request.head.sha first set COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} set BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) - set VERSION=$(grep version package.json | cut -d: -f2 | sed 's/[",]//g' | awk '{print $1}') + set VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV From bef472a64c3f9e45ea5c5599429f9d744521345d Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 20:01:08 +0100 Subject: [PATCH 27/47] Windows env --- .github/workflows/build.yaml | 134 +++++++++++++++++------------------ 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 831fd466f..9a0a4cc24 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -5,69 +5,69 @@ jobs: build-linux: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Setup environment - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - run: | - # This is the hash of the commit for the PR - # when the action is triggered by PR, empty otherwise - COMMIT_ID=${{ github.event.pull_request.head.sha }} - # This is the hash of the commit when triggered by push - # but the hash of refs/pull//merge, which is different - # from the hash of the latest commit in the PR, that's - # why we try github.event.pull_request.head.sha first - COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} - BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) - VERSION=$(grep version package.json | cut -d: -f2 | sed 's/[",]//g' | awk '{print $1}') - echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV - echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV - - uses: actions/setup-node@v4 - with: - node-version: 20 - check-latest: true - cache: 'npm' - - name: Install linux packages - run: sudo apt-get update && sudo apt-get install wine devscripts sbuild rpm - #- name: Download node.js - # run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local - - name: Install deps - uses: nick-fields/retry@v2 - with: - max_attempts: 3 - retry_on: error - command: npm install - timeout_minutes: 10 - - name: Create apps folder - run: mkdir -p apps - - name: build linux64 release - id: build1 - uses: nick-fields/retry@v2 - with: - max_attempts: 3 - retry_on: error - timeout_minutes: 20 - command: sync && node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer - continue-on-error: true - - name: build linux64 release 2 - id: build2 - if: steps.build1.outcome == 'failure' - run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer - - name: Upload deb - uses: actions/upload-artifact@v3 - with: - name: ${{ env.BUILD_NAME }} deb - path: apps/*.deb - - name: Upload rpm - uses: actions/upload-artifact@v3 - with: - name: ${{ env.BUILD_NAME }} rpm - path: apps/*.rpm - - name: Upload linux binary - uses: actions/upload-artifact@v3 - with: - name: ${{ env.BUILD_NAME }} tar.gz - path: apps/*.tar.gz + - uses: actions/checkout@v4 + - name: Setup environment + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true + run: | + # This is the hash of the commit for the PR + # when the action is triggered by PR, empty otherwise + COMMIT_ID=${{ github.event.pull_request.head.sha }} + # This is the hash of the commit when triggered by push + # but the hash of refs/pull//merge, which is different + # from the hash of the latest commit in the PR, that's + # why we try github.event.pull_request.head.sha first + COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} + BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) + VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') + echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV + echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV + - uses: actions/setup-node@v4 + with: + node-version: 20 + check-latest: true + cache: 'npm' + - name: Install linux packages + run: sudo apt-get update && sudo apt-get install wine devscripts sbuild rpm + #- name: Download node.js + # run: curl -o /tmp/node.tar.xz https://nodejs.org/dist/v20.10.0/node-v20.10.0-linux-x64.tar.xz && sudo tar --strip-components=1 -xJvf /tmp/node.tar.xz -C /usr/local + - name: Install deps + uses: nick-fields/retry@v2 + with: + max_attempts: 3 + retry_on: error + command: npm install + timeout_minutes: 10 + - name: Create apps folder + run: mkdir -p apps + - name: build linux64 release + id: build1 + uses: nick-fields/retry@v2 + with: + max_attempts: 3 + retry_on: error + timeout_minutes: 20 + command: sync && node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer + continue-on-error: true + - name: build linux64 release 2 + id: build2 + if: steps.build1.outcome == 'failure' + run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer + - name: Upload deb + uses: actions/upload-artifact@v3 + with: + name: ${{ env.BUILD_NAME }} deb + path: apps/*.deb + - name: Upload rpm + uses: actions/upload-artifact@v3 + with: + name: ${{ env.BUILD_NAME }} rpm + path: apps/*.rpm + - name: Upload linux binary + uses: actions/upload-artifact@v3 + with: + name: ${{ env.BUILD_NAME }} tar.gz + path: apps/*.tar.gz build-mac: runs-on: macos-latest @@ -86,7 +86,7 @@ jobs: # why we try github.event.pull_request.head.sha first COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) - VERSION=$(grep version package.json | cut -d: -f2 | sed 's/[",]//g' | awk '{print $1}') + VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV - uses: actions/setup-node@v4 @@ -155,17 +155,17 @@ jobs: - name: Upload msi uses: actions/upload-artifact@v3 with: - name: Configurator win64 msi + name: ${{ env.BUILD_NAME }} win64 msi path: apps/*.msi - name: Upload exe uses: actions/upload-artifact@v3 with: - name: Configurator win64 exe + name: ${{ env.BUILD_NAME }} win64 exe path: apps/*.exe - name: Upload zip uses: actions/upload-artifact@v3 with: - name: Configurator win64 zip + name: ${{ env.BUILD_NAME }} win64 zip path: apps/*.zip From bbc575a390a842c1eb9c4124676d8d268327f704 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 20:22:38 +0100 Subject: [PATCH 28/47] Windows bash --- .github/workflows/build.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9a0a4cc24..965b7ee24 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -127,16 +127,17 @@ jobs: run: | # This is the hash of the commit for the PR # when the action is triggered by PR, empty otherwise - set COMMIT_ID=${{ github.event.pull_request.head.sha }} + COMMIT_ID=${{ github.event.pull_request.head.sha }} # This is the hash of the commit when triggered by push # but the hash of refs/pull//merge, which is different # from the hash of the latest commit in the PR, that's # why we try github.event.pull_request.head.sha first - set COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} - set BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) - set VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') + COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} + BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) + VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV + shell: bash - uses: actions/setup-node@v4 with: From c96d16c502467605cb356d35e0780b2fcb45e8ca Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 20:59:49 +0100 Subject: [PATCH 29/47] Debugging --- .github/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 965b7ee24..d96ec39ae 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,7 +3,7 @@ on: pull_request jobs: build-linux: - runs-on: ubuntu-latest + runs-on: debian-latest steps: - uses: actions/checkout@v4 - name: Setup environment @@ -20,6 +20,7 @@ jobs: COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') + echo "ACTIONS_STEP_DEBUG=true" >> $GITHUB_ENV echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV - uses: actions/setup-node@v4 @@ -135,6 +136,7 @@ jobs: COMMIT_ID=${COMMIT_ID:-${{ github.sha }}} BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g') + echo "ACTIONS_STEP_DEBUG=true" >> $GITHUB_ENV echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV shell: bash From c505cdde523e6bb178796c0b93e4cb3f13bbedba Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 21:28:57 +0100 Subject: [PATCH 30/47] Ubuntu --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d96ec39ae..22b4df7bf 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -3,7 +3,7 @@ on: pull_request jobs: build-linux: - runs-on: debian-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Setup environment From 158dd901ecd6c423636c4c8aa047386b9f78d4da Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 21:50:44 +0100 Subject: [PATCH 31/47] Ubuntu --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 22b4df7bf..97559225c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,12 +48,12 @@ jobs: max_attempts: 3 retry_on: error timeout_minutes: 20 - command: sync && node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer + command: sync && node ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer continue-on-error: true - name: build linux64 release 2 id: build2 if: steps.build1.outcome == 'failure' - run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 -LLLL --installer + run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer - name: Upload deb uses: actions/upload-artifact@v3 with: From 593240ce501a8a653b018d127f747b357a68a74c Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 23:26:15 +0100 Subject: [PATCH 32/47] Don't rename .deb file, as the package follows the standard for .deb package names --- gulpfile.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 5d4d6fcd4..3c23a29f8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -597,18 +597,6 @@ function post_release_deb(arch) { done(); return null; } - if ((arch === 'linux32') || (arch === 'linux64')) { - var rename = require("gulp-rename"); - const metadata = require('./package.json'); - const renameFrom = path.join(appsDir, metadata.name + '_' + metadata.version + '_' + getLinuxPackageArch('.deb', arch) + '.deb'); - const renameTo = path.join(appsDir, get_release_filename_base(arch) + '_' + metadata.version + '.deb'); - // Rename .deb build to common naming - console.log(`Renaming .deb installer ${renameFrom} to ${renameTo}`); - return gulp.src(renameFrom) - .pipe(rename(renameTo)) - .pipe(gulp.dest(".")); - } - return done(); } } From 2d066805b00889425f09a7d697ed146b04f89318 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 23:38:19 +0100 Subject: [PATCH 33/47] Rename artifacts --- .github/workflows/build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 97559225c..0c85368da 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -57,17 +57,17 @@ jobs: - name: Upload deb uses: actions/upload-artifact@v3 with: - name: ${{ env.BUILD_NAME }} deb + name: ${{ env.BUILD_NAME }} Linux64 deb path: apps/*.deb - name: Upload rpm uses: actions/upload-artifact@v3 with: - name: ${{ env.BUILD_NAME }} rpm + name: ${{ env.BUILD_NAME }} Linux64 rpm path: apps/*.rpm - name: Upload linux binary uses: actions/upload-artifact@v3 with: - name: ${{ env.BUILD_NAME }} tar.gz + name: ${{ env.BUILD_NAME }} Linux64 tar.gz path: apps/*.tar.gz build-mac: @@ -158,17 +158,17 @@ jobs: - name: Upload msi uses: actions/upload-artifact@v3 with: - name: ${{ env.BUILD_NAME }} win64 msi + name: ${{ env.BUILD_NAME }} Windows 64 msi path: apps/*.msi - name: Upload exe uses: actions/upload-artifact@v3 with: - name: ${{ env.BUILD_NAME }} win64 exe + name: ${{ env.BUILD_NAME }} Windows 64 exe path: apps/*.exe - name: Upload zip uses: actions/upload-artifact@v3 with: - name: ${{ env.BUILD_NAME }} win64 zip + name: ${{ env.BUILD_NAME }} Windows 64 zip path: apps/*.zip From fe3740c254d05c7326c599aeffba213c9d39afa9 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Mon, 25 Dec 2023 23:46:03 +0100 Subject: [PATCH 34/47] node js versionx --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0c85368da..e028f18ec 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,7 +25,7 @@ jobs: echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 21 check-latest: true cache: 'npm' - name: Install linux packages @@ -92,7 +92,7 @@ jobs: echo "BUILD_NAME=inav-configurator-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 21 check-latest: true cache: 'npm' - name: Install packages @@ -143,7 +143,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 21 check-latest: true cache: 'npm' - name: Install deps From b9514d9eb88f241d9d37d278ff86926c6df53074 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 00:17:08 +0100 Subject: [PATCH 35/47] change memory options for linux build --- .github/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e028f18ec..404077944 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,12 +48,13 @@ jobs: max_attempts: 3 retry_on: error timeout_minutes: 20 - command: sync && node ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer + command: sync && node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer continue-on-error: true - name: build linux64 release 2 id: build2 if: steps.build1.outcome == 'failure' run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer + continue-on-error: true - name: Upload deb uses: actions/upload-artifact@v3 with: From efa082329bf189782c0ca01b95c0964e0e5aefa8 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 00:32:03 +0100 Subject: [PATCH 36/47] Cleanup --- .github/workflows/build.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 404077944..b1ad2356f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -49,12 +49,7 @@ jobs: retry_on: error timeout_minutes: 20 command: sync && node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer - continue-on-error: true - - name: build linux64 release 2 - id: build2 - if: steps.build1.outcome == 'failure' - run: node ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer - continue-on-error: true + #continue-on-error: true - name: Upload deb uses: actions/upload-artifact@v3 with: From dbaa058e0116f4463bac6046ab2c17da35b3af87 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 00:35:10 +0100 Subject: [PATCH 37/47] Split build and --- .github/workflows/build.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b1ad2356f..4d63d6206 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -41,15 +41,25 @@ jobs: timeout_minutes: 10 - name: Create apps folder run: mkdir -p apps - - name: build linux64 release + - name: build linux64 id: build1 uses: nick-fields/retry@v2 with: max_attempts: 3 retry_on: error timeout_minutes: 20 - command: sync && node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer + command: node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js clean && node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js build #continue-on-error: true + - name: linux64 release + id: release1 + uses: nick-fields/retry@v2 + with: + max_attempts: 3 + retry_on: error + timeout_minutes: 20 + command: node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer + #continue-on-error: true + - name: Upload deb uses: actions/upload-artifact@v3 with: From 0d812a0d9873e03b3686dfb07a892a02b9c8b405 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 00:44:28 +0100 Subject: [PATCH 38/47] Upload tunning --- .github/workflows/build.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4d63d6206..8f4b85b68 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -61,17 +61,17 @@ jobs: #continue-on-error: true - name: Upload deb - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_NAME }} Linux64 deb path: apps/*.deb - name: Upload rpm - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_NAME }} Linux64 rpm path: apps/*.rpm - name: Upload linux binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_NAME }} Linux64 tar.gz path: apps/*.tar.gz @@ -117,7 +117,7 @@ jobs: - name: build macos release run: node ./node_modules/gulp/bin/gulp.js release --platform=osx64 -LLLL - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{env.BUILD_NAME}} MacOSX zip path: apps/*.zip @@ -162,20 +162,21 @@ jobs: - name: build win64 release run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 -LLLL --installer - name: Upload msi - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_NAME }} Windows 64 msi path: apps/*.msi - name: Upload exe - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_NAME }} Windows 64 exe path: apps/*.exe - name: Upload zip - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.BUILD_NAME }} Windows 64 zip path: apps/*.zip + compression-level: 0 From 8b9daf3927f9c97bfb92b6a2713fafce15fdbc91 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:37:19 +0100 Subject: [PATCH 39/47] bump minimist version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 790b6ce0f..fc5339ae0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "jquery": "2.1.4", "jquery-ui-npm": "1.12.0", "marked": "^0.3.17", - "minimist": "^1.2.0", + "minimist": "^1.2.8", "nw": "^0.61.0-sdk", "nw-dialog": "^1.0.7", "openlayers": "^4.6.5", @@ -5024,9 +5024,9 @@ } }, "node_modules/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -13353,9 +13353,9 @@ } }, "minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==" + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" }, "minipass": { "version": "3.3.6", diff --git a/package.json b/package.json index 41bc2470c..7a41a96f3 100755 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "jquery": "2.1.4", "jquery-ui-npm": "1.12.0", "marked": "^0.3.17", - "minimist": "^1.2.0", + "minimist": "^1.2.8", "nw": "^0.61.0-sdk", "nw-dialog": "^1.0.7", "openlayers": "^4.6.5", From 5e19684f2ff8299bbb606ea9cda1fd643ef8868c Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 12:54:22 +0100 Subject: [PATCH 40/47] Fix master merge --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33c3b2058..fbdd84d1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "jquery-ui-npm": "1.12.0", "marked": "^0.3.17", "minimist": "^1.2.8", - "nw": "^0.61.0-sdk", + "nw": "^0.81.0", "nw-dialog": "^1.0.7", "openlayers": "^4.6.5", "plotly": "^1.0.6", diff --git a/package.json b/package.json index 5d1150ba6..598d7fd5d 100755 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "jquery-ui-npm": "1.12.0", "marked": "^0.3.17", "minimist": "^1.2.8", - "nw": "^0.61.0-sdk", + "nw": "^0.81.0", "nw-dialog": "^1.0.7", "openlayers": "^4.6.5", "plotly": "^1.0.6", From 54bb84db9bb9230a7b1c12d1f2b8a16242f86887 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 13:14:00 +0100 Subject: [PATCH 41/47] update gulp depencies --- package-lock.json | 24 ++++++++++++++++++++---- package.json | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbdd84d1d..23244e893 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@quanle94/innosetup": "^6.0.2", - "gulp-debian": "^0.1.9", + "gulp-debian": "^0.3.2", "gulp-rename": "^2.0.0", "nw-builder": "3.8.6", "rpm-builder": "^1.2.1", @@ -2639,6 +2639,15 @@ "node": ">=0.10.0" } }, + "node_modules/find": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/find/-/find-0.2.9.tgz", + "integrity": "sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ==", + "dev": true, + "dependencies": { + "traverse-chain": "~0.1.0" + } + }, "node_modules/find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -3571,11 +3580,12 @@ } }, "node_modules/gulp-debian": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/gulp-debian/-/gulp-debian-0.1.9.tgz", - "integrity": "sha512-hY16Lj5IdxY213L9Sl6SlEgpCvf8/ny3SQ4S9dyG8MHqRx0fPpui5CRodhQK5lA2oScxP8qi4wfK4fIDr5xF3g==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/gulp-debian/-/gulp-debian-0.3.2.tgz", + "integrity": "sha512-P9zqKFQ9xRG1wvcJUYiBxUEypoPcDsFJxmxyJ6PSyfF2iOcsIk1mPTp47Qs0Q36bdWvrauvGTvJxscFIhK1U3A==", "dev": true, "dependencies": { + "find": "^0.2.8", "fs-extra": "^5.0.0", "gulp-util": "^3.0.8", "through2": "^2.0.1", @@ -8434,6 +8444,12 @@ "node": "*" } }, + "node_modules/traverse-chain": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz", + "integrity": "sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg==", + "dev": true + }, "node_modules/trim-repeated": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", diff --git a/package.json b/package.json index 598d7fd5d..d86992581 100755 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@quanle94/innosetup": "^6.0.2", - "gulp-debian": "^0.1.9", + "gulp-debian": "^0.3.2", "gulp-rename": "^2.0.0", "nw-builder": "3.8.6", "rpm-builder": "^1.2.1", From 73b5543345465a9194bedb6f9ca067a7aa62505f Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 13:21:16 +0100 Subject: [PATCH 42/47] add --trace-deprecation --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8f4b85b68..2279b5977 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,7 +48,7 @@ jobs: max_attempts: 3 retry_on: error timeout_minutes: 20 - command: node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js clean && node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js build + command: node --trace-deprecation --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js clean && node --trace-deprecation --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js build #continue-on-error: true - name: linux64 release id: release1 @@ -57,7 +57,7 @@ jobs: max_attempts: 3 retry_on: error timeout_minutes: 20 - command: node --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer + command: node --trace-deprecation --max-old-space-size=4096 ./node_modules/gulp/bin/gulp.js release --platform=linux64 --installer #continue-on-error: true - name: Upload deb @@ -115,7 +115,7 @@ jobs: - name: Create apps folder run: mkdir -p apps - name: build macos release - run: node ./node_modules/gulp/bin/gulp.js release --platform=osx64 -LLLL + run: node --trace-deprecation ./node_modules/gulp/bin/gulp.js release --platform=osx64 - name: Upload artifacts uses: actions/upload-artifact@v4 with: @@ -160,7 +160,7 @@ jobs: command: npm install timeout_minutes: 10 - name: build win64 release - run: node ./node_modules/gulp/bin/gulp.js release --platform=win64 -LLLL --installer + run: node --trace-deprecation ./node_modules/gulp/bin/gulp.js release --platform=win64 --installer - name: Upload msi uses: actions/upload-artifact@v4 with: From 34e55aedfe4cf2f5357c38216c828ca181f6c311 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 14:27:41 +0100 Subject: [PATCH 43/47] verbose debian package generation --- gulpfile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 3c23a29f8..2b0bc1c9e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -574,7 +574,7 @@ function release_deb(arch) { architecture: getLinuxPackageArch('deb', arch), maintainer: metadata.author, description: metadata.description, - preinst: [`rm -rf ${LINUX_INSTALL_DIR}/${metadata.name}`], + preinst: [`rm -rfv ${LINUX_INSTALL_DIR}/${metadata.name}`], postinst: [ `chown root:root ${LINUX_INSTALL_DIR}`, `chown -R root:root ${LINUX_INSTALL_DIR}/${metadata.name}`, @@ -587,6 +587,7 @@ function release_deb(arch) { _out: appsDir, _copyright: 'assets/linux/copyright', _clean: true, + _verbose: true })); } } From 77fe4f210e8439b735dc9d073cf465602f5ba330 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 15:13:53 +0100 Subject: [PATCH 44/47] revert gulp-debian --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 23244e893..8fff531fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@quanle94/innosetup": "^6.0.2", - "gulp-debian": "^0.3.2", + "gulp-debian": "^0.1.9", "gulp-rename": "^2.0.0", "nw-builder": "3.8.6", "rpm-builder": "^1.2.1", diff --git a/package.json b/package.json index d86992581..598d7fd5d 100755 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@quanle94/innosetup": "^6.0.2", - "gulp-debian": "^0.3.2", + "gulp-debian": "^0.1.9", "gulp-rename": "^2.0.0", "nw-builder": "3.8.6", "rpm-builder": "^1.2.1", From 196e43c3f6f706facfa2faba570c2e52cfec0022 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 15:14:31 +0100 Subject: [PATCH 45/47] rever to gulp-debian 0.1.9 --- package-lock.json | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fff531fb..fbdd84d1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2639,15 +2639,6 @@ "node": ">=0.10.0" } }, - "node_modules/find": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/find/-/find-0.2.9.tgz", - "integrity": "sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ==", - "dev": true, - "dependencies": { - "traverse-chain": "~0.1.0" - } - }, "node_modules/find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -3580,12 +3571,11 @@ } }, "node_modules/gulp-debian": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/gulp-debian/-/gulp-debian-0.3.2.tgz", - "integrity": "sha512-P9zqKFQ9xRG1wvcJUYiBxUEypoPcDsFJxmxyJ6PSyfF2iOcsIk1mPTp47Qs0Q36bdWvrauvGTvJxscFIhK1U3A==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/gulp-debian/-/gulp-debian-0.1.9.tgz", + "integrity": "sha512-hY16Lj5IdxY213L9Sl6SlEgpCvf8/ny3SQ4S9dyG8MHqRx0fPpui5CRodhQK5lA2oScxP8qi4wfK4fIDr5xF3g==", "dev": true, "dependencies": { - "find": "^0.2.8", "fs-extra": "^5.0.0", "gulp-util": "^3.0.8", "through2": "^2.0.1", @@ -8444,12 +8434,6 @@ "node": "*" } }, - "node_modules/traverse-chain": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz", - "integrity": "sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg==", - "dev": true - }, "node_modules/trim-repeated": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", From 647e855c291c958437e0c2aa7fe0b8725777e837 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 15:25:01 +0100 Subject: [PATCH 46/47] Update gulp-debian to 0.2.0 --- package-lock.json | 24 ++++++++++++++++++++---- package.json | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fbdd84d1d..4d65ebb14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@quanle94/innosetup": "^6.0.2", - "gulp-debian": "^0.1.9", + "gulp-debian": "^0.2.0", "gulp-rename": "^2.0.0", "nw-builder": "3.8.6", "rpm-builder": "^1.2.1", @@ -2639,6 +2639,15 @@ "node": ">=0.10.0" } }, + "node_modules/find": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/find/-/find-0.2.9.tgz", + "integrity": "sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ==", + "dev": true, + "dependencies": { + "traverse-chain": "~0.1.0" + } + }, "node_modules/find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -3571,11 +3580,12 @@ } }, "node_modules/gulp-debian": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/gulp-debian/-/gulp-debian-0.1.9.tgz", - "integrity": "sha512-hY16Lj5IdxY213L9Sl6SlEgpCvf8/ny3SQ4S9dyG8MHqRx0fPpui5CRodhQK5lA2oScxP8qi4wfK4fIDr5xF3g==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/gulp-debian/-/gulp-debian-0.2.0.tgz", + "integrity": "sha512-DFsThQRbDq+aSpR0BcuEH3mlwEMsZCmlpYES9xecNILDH2P0jlfZD0jdeM+Sb4Yyhh1Emd3m7yOwfcmLLNg7BQ==", "dev": true, "dependencies": { + "find": "^0.2.8", "fs-extra": "^5.0.0", "gulp-util": "^3.0.8", "through2": "^2.0.1", @@ -8434,6 +8444,12 @@ "node": "*" } }, + "node_modules/traverse-chain": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz", + "integrity": "sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg==", + "dev": true + }, "node_modules/trim-repeated": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", diff --git a/package.json b/package.json index 598d7fd5d..cc26b3834 100755 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@quanle94/innosetup": "^6.0.2", - "gulp-debian": "^0.1.9", + "gulp-debian": "^0.2.0", "gulp-rename": "^2.0.0", "nw-builder": "3.8.6", "rpm-builder": "^1.2.1", From 33767ef4c638d46530fd71e2dbcee49b85eddd56 Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Tue, 26 Dec 2023 15:39:49 +0100 Subject: [PATCH 47/47] Stick with gulp-debain 0.1.9 for now. 0.2.0 seems broken, as is the latest 0.3.2 --- package-lock.json | 24 ++++-------------------- package.json | 2 +- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d65ebb14..fbdd84d1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@quanle94/innosetup": "^6.0.2", - "gulp-debian": "^0.2.0", + "gulp-debian": "^0.1.9", "gulp-rename": "^2.0.0", "nw-builder": "3.8.6", "rpm-builder": "^1.2.1", @@ -2639,15 +2639,6 @@ "node": ">=0.10.0" } }, - "node_modules/find": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/find/-/find-0.2.9.tgz", - "integrity": "sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ==", - "dev": true, - "dependencies": { - "traverse-chain": "~0.1.0" - } - }, "node_modules/find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -3580,12 +3571,11 @@ } }, "node_modules/gulp-debian": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/gulp-debian/-/gulp-debian-0.2.0.tgz", - "integrity": "sha512-DFsThQRbDq+aSpR0BcuEH3mlwEMsZCmlpYES9xecNILDH2P0jlfZD0jdeM+Sb4Yyhh1Emd3m7yOwfcmLLNg7BQ==", + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/gulp-debian/-/gulp-debian-0.1.9.tgz", + "integrity": "sha512-hY16Lj5IdxY213L9Sl6SlEgpCvf8/ny3SQ4S9dyG8MHqRx0fPpui5CRodhQK5lA2oScxP8qi4wfK4fIDr5xF3g==", "dev": true, "dependencies": { - "find": "^0.2.8", "fs-extra": "^5.0.0", "gulp-util": "^3.0.8", "through2": "^2.0.1", @@ -8444,12 +8434,6 @@ "node": "*" } }, - "node_modules/traverse-chain": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz", - "integrity": "sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg==", - "dev": true - }, "node_modules/trim-repeated": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", diff --git a/package.json b/package.json index cc26b3834..598d7fd5d 100755 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@quanle94/innosetup": "^6.0.2", - "gulp-debian": "^0.2.0", + "gulp-debian": "^0.1.9", "gulp-rename": "^2.0.0", "nw-builder": "3.8.6", "rpm-builder": "^1.2.1",