From 82022f92dbf83d5e713424e3acad10a2d525983f Mon Sep 17 00:00:00 2001 From: Carlos Venegas Date: Thu, 16 Feb 2023 17:29:04 +0100 Subject: [PATCH 01/13] nwjs update --- app/package-lock.json | 28 ++++++++++++++-------------- app/package.json | 14 +++++--------- app/scripts/services/utils.js | 1 + package.json | 2 +- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index f7b3006c8..7ab9454da 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -17,7 +17,7 @@ "angular-gettext-tools": "2.3.5", "angular-route": "~1.6.9", "angular-ui-bootstrap": "~1.3.3", - "async": "~1.5.2", + "async": "~3.2.4", "backbone": "~1.3.3", "bootstrap": "~3.3.7", "copy-paste": "~1.3.0", @@ -29,7 +29,7 @@ "glob": "^7.1.4", "jexcel": "^3.9.1", "jointjs": "~2.0.1", - "jquery": "~3.0.0", + "jquery": "~3.6.3", "jsuites": "^2.7.1", "lodash": "~3.10.1", "lodash.debounce": "~3.1.1", @@ -144,9 +144,9 @@ } }, "node_modules/async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" }, "node_modules/babylon": { "version": "6.18.0", @@ -710,9 +710,9 @@ "integrity": "sha1-NHwcIcfgBBFeCk2jLOzgQfrTyKM=" }, "node_modules/jquery": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.0.0.tgz", - "integrity": "sha1-laKpVBKRqfgZ4Bb4W6JHEW0D5Ks=" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" }, "node_modules/js-yaml": { "version": "3.7.0", @@ -1342,9 +1342,9 @@ } }, "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=" + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" }, "babylon": { "version": "6.18.0", @@ -1855,9 +1855,9 @@ } }, "jquery": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.0.0.tgz", - "integrity": "sha1-laKpVBKRqfgZ4Bb4W6JHEW0D5Ks=" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" }, "js-yaml": { "version": "3.7.0", diff --git a/app/package.json b/app/package.json index 2f348d7d5..d99c7babf 100644 --- a/app/package.json +++ b/app/package.json @@ -4,10 +4,6 @@ "version": "0.10.1w", "description": "Visual editor for open FPGA boards", "contributors": [ - { - "name": "Jesús Arroyo Torrens", - "url": "https://github.com/Jesus89" - }, { "name": "Carlos Venegas Arrabe", "url": "https://github.com/cavearr" @@ -29,7 +25,7 @@ "width": 900, "height": 620, "min_width": 800, - "min_height": 300, + "min_height": 300, "resizable": true, "position": "center", "icon": "resources/images/icestudio-logo.png" @@ -48,7 +44,7 @@ }, "collection": "0.3.3", "engines": {}, - "node": ">= 0.10.0", + "node": ">= 19.3.0", "dependencies": { "ace-builds": "~1.4.12", "adm-zip": "0.4.7", @@ -58,7 +54,7 @@ "angular-gettext-tools": "2.3.5", "angular-route": "~1.6.9", "angular-ui-bootstrap": "~1.3.3", - "async": "~1.5.2", + "async": "~3.2.4", "backbone": "~1.3.3", "bootstrap": "~3.3.7", "copy-paste": "~1.3.0", @@ -70,7 +66,7 @@ "glob": "^7.1.4", "jexcel": "^3.9.1", "jointjs": "~2.0.1", - "jquery": "~3.0.0", + "jquery": "~3.6.3", "jsuites": "^2.7.1", "lodash": "~3.10.1", "lodash.debounce": "~3.1.1", @@ -98,4 +94,4 @@ "editor", "hardware" ] -} +} \ No newline at end of file diff --git a/app/scripts/services/utils.js b/app/scripts/services/utils.js index a53e8d3b7..425db64de 100644 --- a/app/scripts/services/utils.js +++ b/app/scripts/services/utils.js @@ -1012,6 +1012,7 @@ angular.module('icestudio') //----------------------------------------------------------------------- this.newWindow = function (filepath) { + console.log('Abriendo ventana'); //-- If there are parameters to pass or not //-- No parameters by default let hasParams = false; diff --git a/package.json b/package.json index fd0427162..e3497ab24 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "grunt-wget": "^0.1.3", "grunt-zip": "^0.18.2", "npm-platform-dependencies": "0.1.0", - "nw": "0.72.0", + "nw": "0.72.0-sdk", "nw-builder": "^3.5.7" }, "darwinDependencies": { From d23ed7b8fd4544ef78244e12e4d992d952ce9ba9 Mon Sep 17 00:00:00 2001 From: Carlos Venegas Date: Thu, 16 Feb 2023 17:45:44 +0100 Subject: [PATCH 02/13] nwjs 0.72.0 version for WIPS --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e3497ab24..7d136886b 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "grunt-wget": "^0.1.3", "grunt-zip": "^0.18.2", "npm-platform-dependencies": "0.1.0", - "nw": "0.72.0-sdk", + "nw": "0.72.0", "nw-builder": "^3.5.7" }, "darwinDependencies": { @@ -53,4 +53,4 @@ "optionalDependencies": { "grunt-appdmg": "github:agoodney/grunt-appdmg" } -} \ No newline at end of file +} From 1bd036e0e6c301a03ccc7d8507bd0b0415c86f97 Mon Sep 17 00:00:00 2001 From: Obijuan Date: Fri, 17 Feb 2023 21:36:57 +0100 Subject: [PATCH 03/13] update github action: ubuntu 22.04 and node 19.3.0 --- .github/workflows/main-aarch64.yml | 4 ++-- .github/workflows/main-osx.yml | 2 +- .github/workflows/main-windows.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- .github/workflows/release-stable.yml | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml index 2c17c6a9f..2e19534fd 100644 --- a/.github/workflows/main-aarch64.yml +++ b/.github/workflows/main-aarch64.yml @@ -16,7 +16,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -29,7 +29,7 @@ jobs: - name: Setup Nodejs version uses: actions/setup-node@v1 with: - node-version: '18.9.1' + node-version: '19.3.0' - name: Install npm dependencies run: npm install --legacy-peer-deps diff --git a/.github/workflows/main-osx.yml b/.github/workflows/main-osx.yml index 6572c9bec..576cbfae2 100644 --- a/.github/workflows/main-osx.yml +++ b/.github/workflows/main-osx.yml @@ -30,7 +30,7 @@ jobs: - name: Setup Nodejs version uses: actions/setup-node@v1 with: - node-version: '18.9.1' + node-version: '19.3.0' - name: Install npm dependencies run: npm install --legacy-peer-deps - name: Build OSX packages diff --git a/.github/workflows/main-windows.yml b/.github/workflows/main-windows.yml index 1ac58739e..0161ac6f5 100644 --- a/.github/workflows/main-windows.yml +++ b/.github/workflows/main-windows.yml @@ -16,7 +16,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -29,7 +29,7 @@ jobs: - name: Setup Nodejs version uses: actions/setup-node@v1 with: - node-version: '18.9.1' + node-version: '19.3.0' - name: Install npm dependencies run: npm install --legacy-peer-deps diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 522314486..e890c28d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # Steps represent a sequence of tasks that will be executed as part of # the job @@ -32,7 +32,7 @@ jobs: - name: Setup Nodejs version uses: actions/setup-node@v1 with: - node-version: '18.9.1' + node-version: '19.3.0' - name: Install npm dependencies run: npm install --legacy-peer-deps diff --git a/.github/workflows/release-stable.yml b/.github/workflows/release-stable.yml index ff90569ff..ee7100826 100644 --- a/.github/workflows/release-stable.yml +++ b/.github/workflows/release-stable.yml @@ -13,7 +13,7 @@ jobs: #-- Build for Linux and windows build-LinWin: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: #-- URL to upload the binaries for #-- the jobs executed after build-LinWin @@ -53,7 +53,7 @@ jobs: - name: Setup Nodejs version uses: actions/setup-node@v1 with: - node-version: '18.9.1' + node-version: '19.3.0' - name: Install npm dependencies run: | @@ -171,7 +171,7 @@ jobs: - name: Setup Nodejs version uses: actions/setup-node@v1 with: - node-version: '17.3.0' + node-version: '19.3.0' - name: Install npm dependencies run: npm install - name: Build OSX packages @@ -217,7 +217,7 @@ jobs: needs: build-LinWin # The type of runner that the job will run on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -230,7 +230,7 @@ jobs: - name: Setup Nodejs version uses: actions/setup-node@v1 with: - node-version: '17.3.0' + node-version: '19.3.0' - name: Install npm dependencies run: npm install From 7817fb7d1be984c82c2d03a25674ef0128d147b9 Mon Sep 17 00:00:00 2001 From: Obijuan Date: Fri, 17 Feb 2023 21:58:13 +0100 Subject: [PATCH 04/13] Actions upgraded to v3 (Build warning removed) --- .github/workflows/build-windows-manual.yml | 8 ++++---- .github/workflows/main-aarch64.yml | 6 +++--- .github/workflows/main-osx.yml | 8 ++++---- .github/workflows/main-windows.yml | 8 ++++---- .github/workflows/main.yml | 8 ++++---- .github/workflows/release-stable.yml | 12 ++++++------ .github/workflows/test-upload-artifact.yml | 2 +- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-windows-manual.yml b/.github/workflows/build-windows-manual.yml index b6d9cbd09..aa38b976a 100644 --- a/.github/workflows/build-windows-manual.yml +++ b/.github/workflows/build-windows-manual.yml @@ -14,12 +14,12 @@ jobs: steps: # Checkout the develop branch - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: develop - name: Setup Nodejs version - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '18.9.1' @@ -63,7 +63,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: 'actions/upload-artifact@v2' + uses: 'actions/upload-artifact@v3' with: name: "win64_MSI_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-win64.exe" @@ -73,7 +73,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: 'actions/upload-artifact@v2' + uses: 'actions/upload-artifact@v3' with: name: "win64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-win64.zip" diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml index 2e19534fd..5ea59eaf1 100644 --- a/.github/workflows/main-aarch64.yml +++ b/.github/workflows/main-aarch64.yml @@ -22,12 +22,12 @@ jobs: steps: # Checkout the develop branch - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: develop - name: Setup Nodejs version - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '19.3.0' @@ -58,7 +58,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: 'actions/upload-artifact@v2' + uses: 'actions/upload-artifact@v3' with: name: "Aarch64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-aarch64.zip" diff --git a/.github/workflows/main-osx.yml b/.github/workflows/main-osx.yml index 576cbfae2..d9b102fdb 100644 --- a/.github/workflows/main-osx.yml +++ b/.github/workflows/main-osx.yml @@ -23,12 +23,12 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: develop - name: Setup Nodejs version - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '19.3.0' - name: Install npm dependencies @@ -54,7 +54,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: "osx64_DMG_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osx64.dmg" @@ -64,7 +64,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: "osx64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osx64.zip" diff --git a/.github/workflows/main-windows.yml b/.github/workflows/main-windows.yml index 0161ac6f5..f4df930bf 100644 --- a/.github/workflows/main-windows.yml +++ b/.github/workflows/main-windows.yml @@ -22,12 +22,12 @@ jobs: steps: # Checkout the develop branch - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: develop - name: Setup Nodejs version - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '19.3.0' @@ -71,7 +71,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: 'actions/upload-artifact@v2' + uses: 'actions/upload-artifact@v3' with: name: "win64_MSI_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-win64.exe" @@ -81,7 +81,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: 'actions/upload-artifact@v2' + uses: 'actions/upload-artifact@v3' with: name: "win64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-win64.zip" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e890c28d9..6292f9614 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,12 +25,12 @@ jobs: steps: # Checkout the develop branch - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: develop - name: Setup Nodejs version - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '19.3.0' @@ -61,7 +61,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: 'actions/upload-artifact@v2' + uses: 'actions/upload-artifact@v3' with: name: "linux64_AppImage_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-linux64.AppImage" @@ -71,7 +71,7 @@ jobs: env: ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" - uses: 'actions/upload-artifact@v2' + uses: 'actions/upload-artifact@v3' with: name: "linux64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-linux64.zip" diff --git a/.github/workflows/release-stable.yml b/.github/workflows/release-stable.yml index ee7100826..d8dc4bb5c 100644 --- a/.github/workflows/release-stable.yml +++ b/.github/workflows/release-stable.yml @@ -28,7 +28,7 @@ jobs: # Checkout the master repo branch - name: Checkout! - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: master @@ -51,7 +51,7 @@ jobs: # Install Node - name: Setup Nodejs version - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '19.3.0' @@ -164,12 +164,12 @@ jobs: steps: - name: Checkout the master repo branch - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: master - name: Setup Nodejs version - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '19.3.0' - name: Install npm dependencies @@ -223,12 +223,12 @@ jobs: steps: # Checkout the develop branch - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: master - name: Setup Nodejs version - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: node-version: '19.3.0' diff --git a/.github/workflows/test-upload-artifact.yml b/.github/workflows/test-upload-artifact.yml index 1e42a357a..b44676811 100644 --- a/.github/workflows/test-upload-artifact.yml +++ b/.github/workflows/test-upload-artifact.yml @@ -17,6 +17,6 @@ jobs: - name: Test creating dist files run: dd if=/dev/zero of=test.dat bs=1024 count=1024 - name: 'Upload artifact' - uses: 'actions/upload-artifact@v2' + uses: 'actions/upload-artifact@v3' with: path: test.dat From d182a85b44ecd7379b1e4f9ab6cfd23592cacf72 Mon Sep 17 00:00:00 2001 From: Obijuan Date: Fri, 17 Feb 2023 22:22:25 +0100 Subject: [PATCH 05/13] Fixed: Set-output deprecated (github action) --- .github/workflows/build-windows-manual.yml | 4 ++-- .github/workflows/main-aarch64.yml | 4 ++-- .github/workflows/main-osx.yml | 5 +++-- .github/workflows/main-windows.yml | 4 ++-- .github/workflows/main.yml | 4 ++-- .github/workflows/release-stable.yml | 6 +++--- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-windows-manual.yml b/.github/workflows/build-windows-manual.yml index aa38b976a..7a14a4389 100644 --- a/.github/workflows/build-windows-manual.yml +++ b/.github/workflows/build-windows-manual.yml @@ -51,13 +51,13 @@ jobs: content="${content//'%'/'%25'}" content="${content//$'\n'/'%0A'}" content="${content//$'\r'/'%0D'}" - echo "::set-output name=packageJson::$content" + echo "packageJson=${content}" >> $GITHUB_OUTPUT # Timestamp for the build - id: build_date run: | content=`tr '\n' ' ' < app/buildinfo.json` - echo "::set-output name=buildJson::$content" + echo "buildJson=${content}" >> $GITHUB_OUTPUT - name: 'Upload MSI/win64' env: diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml index 5ea59eaf1..7653b2df2 100644 --- a/.github/workflows/main-aarch64.yml +++ b/.github/workflows/main-aarch64.yml @@ -46,13 +46,13 @@ jobs: content="${content//'%'/'%25'}" content="${content//$'\n'/'%0A'}" content="${content//$'\r'/'%0D'}" - echo "::set-output name=packageJson::$content" + echo "packageJson=${content}" >> $GITHUB_OUTPUT # Timestamp for the build - id: build_date run: | content=`tr '\n' ' ' < app/buildinfo.json` - echo "::set-output name=buildJson::$content"h + echo "buildJson=${content}" >> $GITHUB_OUTPUT - name: 'Upload ZIP/Aarch64' env: diff --git a/.github/workflows/main-osx.yml b/.github/workflows/main-osx.yml index d9b102fdb..10a420557 100644 --- a/.github/workflows/main-osx.yml +++ b/.github/workflows/main-osx.yml @@ -42,13 +42,14 @@ jobs: - id: icestudio_json run: | content=`tr '\n' ' ' < package.json` - echo "::set-output name=packageJson::$content" + echo "packageJson=${content}" >> $GITHUB_OUTPUT + # Timestamp for the build - id: build_date run: | content=`tr '\n' ' ' < app/buildinfo.json` - echo "::set-output name=buildJson::$content" + echo "buildJson=${content}" >> $GITHUB_OUTPUT - name: 'Upload DMG/OSX64' env: diff --git a/.github/workflows/main-windows.yml b/.github/workflows/main-windows.yml index f4df930bf..8f9011cdf 100644 --- a/.github/workflows/main-windows.yml +++ b/.github/workflows/main-windows.yml @@ -59,13 +59,13 @@ jobs: content="${content//'%'/'%25'}" content="${content//$'\n'/'%0A'}" content="${content//$'\r'/'%0D'}" - echo "::set-output name=packageJson::$content" + echo "packageJson=${content}" >> $GITHUB_OUTPUT # Timestamp for the build - id: build_date run: | content=`tr '\n' ' ' < app/buildinfo.json` - echo "::set-output name=buildJson::$content" + echo "buildJson=${content}" >> $GITHUB_OUTPUT - name: 'Upload MSI/win64' env: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6292f9614..09fab70ea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,13 +49,13 @@ jobs: content="${content//'%'/'%25'}" content="${content//$'\n'/'%0A'}" content="${content//$'\r'/'%0D'}" - echo "::set-output name=packageJson::$content" + echo "packageJson=${content}" >> $GITHUB_OUTPUT # Timestamp for the build - id: build_date run: | content=`tr '\n' ' ' < app/buildinfo.json` - echo "::set-output name=buildJson::$content" + echo "buildJson=${content}" >> $GITHUB_OUTPUT - name: 'Upload AppImage/linux64' env: diff --git a/.github/workflows/release-stable.yml b/.github/workflows/release-stable.yml index d8dc4bb5c..f2e827c31 100644 --- a/.github/workflows/release-stable.yml +++ b/.github/workflows/release-stable.yml @@ -40,7 +40,7 @@ jobs: content="${content//'%'/'%25'}" content="${content//$'\n'/'%0A'}" content="${content//$'\r'/'%0D'}" - echo "::set-output name=packageJson::$content" + echo "packageJson=${content}" >> $GITHUB_OUTPUT # -- Debug: Print the icestudio version - name: Get the Icestudio version @@ -183,7 +183,7 @@ jobs: - id: icestudio_json run: | content=`tr '\n' ' ' < package.json` - echo "::set-output name=packageJson::$content" + echo "packageJson=${content}" >> $GITHUB_OUTPUT # Upload the binaries to the release - name: 'Upload DMG/OSX64' @@ -250,7 +250,7 @@ jobs: content="${content//'%'/'%25'}" content="${content//$'\n'/'%0A'}" content="${content//$'\r'/'%0D'}" - echo "::set-output name=packageJson::$content" + echo "packageJson=${content}" >> $GITHUB_OUTPUT # -- Debug: Print the icestudio version # -- It is read from the package.json From eae0e931c65eb5218fd4c7f8e4cdc30bdc2a2c6d Mon Sep 17 00:00:00 2001 From: Obijuan Date: Fri, 17 Feb 2023 22:57:56 +0100 Subject: [PATCH 06/13] github action: icestudio version read using jq package --- .github/workflows/main.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 09fab70ea..a847b13d5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,14 +42,15 @@ jobs: export DISPLAY=:0.0 npm run buildLinux64 - # Loading vars from icestudio package.json + # jq is bash command for reading properties from a json file + - name: Install jq package + run: apt install jq + + # Reading the icestudio version from package.json (version property) - id: icestudio_json run: | - content=`cat package.json` - content="${content//'%'/'%25'}" - content="${content//$'\n'/'%0A'}" - content="${content//$'\r'/'%0D'}" - echo "packageJson=${content}" >> $GITHUB_OUTPUT + version=$(jq -r '.version' package.json) + echo "icestudio_version=${version}" >> $GITHUB_OUTPUT # Timestamp for the build - id: build_date @@ -59,7 +60,7 @@ jobs: - name: 'Upload AppImage/linux64' env: - ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" uses: 'actions/upload-artifact@v3' with: @@ -69,7 +70,7 @@ jobs: - name: 'Upload ZIP/linux64' env: - ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + ICESTUDIO_VERSION: "${{icestudio_version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" uses: 'actions/upload-artifact@v3' with: From 33e8352ec299b499a9ba321731bc6d4f6b0be608 Mon Sep 17 00:00:00 2001 From: Obijuan Date: Fri, 17 Feb 2023 23:43:32 +0100 Subject: [PATCH 07/13] github action: icestudio version read using jq package --- .github/workflows/build-windows-manual.yml | 21 +++++++++++---------- .github/workflows/main-aarch64.yml | 17 +++++++++-------- .github/workflows/main-windows.yml | 19 ++++++++++--------- .github/workflows/main.yml | 6 +++--- .github/workflows/release-stable.yml | 20 ++++++++++---------- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build-windows-manual.yml b/.github/workflows/build-windows-manual.yml index 7a14a4389..60d52e86b 100644 --- a/.github/workflows/build-windows-manual.yml +++ b/.github/workflows/build-windows-manual.yml @@ -8,7 +8,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -21,7 +21,7 @@ jobs: - name: Setup Nodejs version uses: actions/setup-node@v3 with: - node-version: '18.9.1' + node-version: '19.3.0' - name: Install npm dependencies run: npm install @@ -44,14 +44,15 @@ jobs: export DISPLAY=:0.0 npm run buildWindows - # Loading vars from icestudio package.json + # jq is bash command for reading properties from a json file + - name: Install jq package + run: apt install jq + + # Read the icestudio version from package.json (version property) - id: icestudio_json run: | - content=`cat package.json` - content="${content//'%'/'%25'}" - content="${content//$'\n'/'%0A'}" - content="${content//$'\r'/'%0D'}" - echo "packageJson=${content}" >> $GITHUB_OUTPUT + version=$(jq -r '.version' package.json) + echo "icestudio_version=${version}" >> $GITHUB_OUTPUT # Timestamp for the build - id: build_date @@ -61,7 +62,7 @@ jobs: - name: 'Upload MSI/win64' env: - ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + ICESTUDIO_VERSION:"${{steps.icestudio_json.icestudio_version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" uses: 'actions/upload-artifact@v3' with: @@ -71,7 +72,7 @@ jobs: - name: 'Upload ZIP/win64' env: - ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" uses: 'actions/upload-artifact@v3' with: diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml index 7653b2df2..9d2324ec0 100644 --- a/.github/workflows/main-aarch64.yml +++ b/.github/workflows/main-aarch64.yml @@ -38,15 +38,16 @@ jobs: run: | export DISPLAY=:0.0 npm run buildAarch64 - - # Loading vars from icestudio package.json + + # jq is bash command for reading properties from a json file + - name: Install jq package + run: apt install jq + + # Read the icestudio version from package.json (version property) - id: icestudio_json run: | - content=`cat package.json` - content="${content//'%'/'%25'}" - content="${content//$'\n'/'%0A'}" - content="${content//$'\r'/'%0D'}" - echo "packageJson=${content}" >> $GITHUB_OUTPUT + version=$(jq -r '.version' package.json) + echo "icestudio_version=${version}" >> $GITHUB_OUTPUT # Timestamp for the build - id: build_date @@ -56,7 +57,7 @@ jobs: - name: 'Upload ZIP/Aarch64' env: - ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" uses: 'actions/upload-artifact@v3' with: diff --git a/.github/workflows/main-windows.yml b/.github/workflows/main-windows.yml index 8f9011cdf..d5236b270 100644 --- a/.github/workflows/main-windows.yml +++ b/.github/workflows/main-windows.yml @@ -51,15 +51,16 @@ jobs: run: | export DISPLAY=:0.0 npm run buildWindows - - # Loading vars from icestudio package.json + + # jq is bash command for reading properties from a json file + - name: Install jq package + run: apt install jq + + # Read the icestudio version from package.json (version property) - id: icestudio_json run: | - content=`cat package.json` - content="${content//'%'/'%25'}" - content="${content//$'\n'/'%0A'}" - content="${content//$'\r'/'%0D'}" - echo "packageJson=${content}" >> $GITHUB_OUTPUT + version=$(jq -r '.version' package.json) + echo "icestudio_version=${version}" >> $GITHUB_OUTPUT # Timestamp for the build - id: build_date @@ -69,7 +70,7 @@ jobs: - name: 'Upload MSI/win64' env: - ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" uses: 'actions/upload-artifact@v3' with: @@ -79,7 +80,7 @@ jobs: - name: 'Upload ZIP/win64' env: - ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" uses: 'actions/upload-artifact@v3' with: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a847b13d5..c38a85fdb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,11 +42,11 @@ jobs: export DISPLAY=:0.0 npm run buildLinux64 - # jq is bash command for reading properties from a json file + # jq is bash command for reading properties from a json file - name: Install jq package run: apt install jq - # Reading the icestudio version from package.json (version property) + # Read the icestudio version from package.json (version property) - id: icestudio_json run: | version=$(jq -r '.version' package.json) @@ -70,7 +70,7 @@ jobs: - name: 'Upload ZIP/linux64' env: - ICESTUDIO_VERSION: "${{icestudio_version}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" uses: 'actions/upload-artifact@v3' with: diff --git a/.github/workflows/release-stable.yml b/.github/workflows/release-stable.yml index f2e827c31..c7ceff08a 100644 --- a/.github/workflows/release-stable.yml +++ b/.github/workflows/release-stable.yml @@ -242,21 +242,21 @@ jobs: echo "====> DEBUG: Contents of the dist folder..." ls -l dist - #-- Read the package.json file - - name: Read the package.json file - id: icestudio_json + # jq is bash command for reading properties from a json file + - name: Install jq package + run: apt install jq + + # Read the icestudio version from package.json (version property) + - id: icestudio_json run: | - content=`cat package.json` - content="${content//'%'/'%25'}" - content="${content//$'\n'/'%0A'}" - content="${content//$'\r'/'%0D'}" - echo "packageJson=${content}" >> $GITHUB_OUTPUT + version=$(jq -r '.version' package.json) + echo "icestudio_version=${version}" >> $GITHUB_OUTPUT # -- Debug: Print the icestudio version # -- It is read from the package.json - name: Get the Icestudio version env: - VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + VERSION: "${{steps.icestudio_json.icestudio_version}}" run: | echo "VERSION: ${{ env.VERSION }}" @@ -267,7 +267,7 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}" + VERSION: "${{steps.icestudio_json.icestudio_version}}" with: upload_url: ${{ needs.build-LinWin.outputs.upload_url }} asset_path: "dist/icestudio-${{env.VERSION}}-aarch64.zip" From f83b6f136a63d2fc208daa51ee0f63d99e1d617f Mon Sep 17 00:00:00 2001 From: Obijuan Date: Fri, 17 Feb 2023 23:56:31 +0100 Subject: [PATCH 08/13] github action: icestudio timestamp read using jq package --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c38a85fdb..844abb16a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,8 +55,8 @@ jobs: # Timestamp for the build - id: build_date run: | - content=`tr '\n' ' ' < app/buildinfo.json` - echo "buildJson=${content}" >> $GITHUB_OUTPUT + timestamp=$(jq -r '.ts' app/buildinfo.json) + echo "icestudio_timestamp=${timestamp}" >> $GITHUB_OUTPUT - name: 'Upload AppImage/linux64' env: @@ -71,7 +71,7 @@ jobs: - name: 'Upload ZIP/linux64' env: ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" + TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "linux64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" From 164922cb89b23aa336ca132c5e6ebdc40923e86d Mon Sep 17 00:00:00 2001 From: Obijuan Date: Sat, 18 Feb 2023 00:06:17 +0100 Subject: [PATCH 09/13] github action: icestudio timestamp read using jq package --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 844abb16a..837da9c76 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,7 +61,7 @@ jobs: - name: 'Upload AppImage/linux64' env: ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" + TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "linux64_AppImage_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" From fd0094da4ead2363ada0f0ee289ead67cfd5936c Mon Sep 17 00:00:00 2001 From: Obijuan Date: Sat, 18 Feb 2023 00:22:42 +0100 Subject: [PATCH 10/13] github action: icestudio timestamp read using jq package --- .github/workflows/build-windows-manual.yml | 12 +++++++++--- .github/workflows/main-aarch64.yml | 8 ++++---- .github/workflows/main-windows.yml | 12 ++++++------ .github/workflows/main.yml | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-windows-manual.yml b/.github/workflows/build-windows-manual.yml index 60d52e86b..3f96d1d30 100644 --- a/.github/workflows/build-windows-manual.yml +++ b/.github/workflows/build-windows-manual.yml @@ -46,7 +46,7 @@ jobs: # jq is bash command for reading properties from a json file - name: Install jq package - run: apt install jq + run: sudo apt install jq # Read the icestudio version from package.json (version property) - id: icestudio_json @@ -54,6 +54,12 @@ jobs: version=$(jq -r '.version' package.json) echo "icestudio_version=${version}" >> $GITHUB_OUTPUT + # Timestamp for the build + - id: build_date + run: | + timestamp=$(jq -r '.ts' app/buildinfo.json) + echo "icestudio_timestamp=${timestamp}" >> $GITHUB_OUTPUT + # Timestamp for the build - id: build_date run: | @@ -63,7 +69,7 @@ jobs: - name: 'Upload MSI/win64' env: ICESTUDIO_VERSION:"${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" + TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "win64_MSI_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" @@ -73,7 +79,7 @@ jobs: - name: 'Upload ZIP/win64' env: ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" + TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "win64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml index 9d2324ec0..f0307accc 100644 --- a/.github/workflows/main-aarch64.yml +++ b/.github/workflows/main-aarch64.yml @@ -41,7 +41,7 @@ jobs: # jq is bash command for reading properties from a json file - name: Install jq package - run: apt install jq + run: sudo apt install jq # Read the icestudio version from package.json (version property) - id: icestudio_json @@ -52,13 +52,13 @@ jobs: # Timestamp for the build - id: build_date run: | - content=`tr '\n' ' ' < app/buildinfo.json` - echo "buildJson=${content}" >> $GITHUB_OUTPUT + timestamp=$(jq -r '.ts' app/buildinfo.json) + echo "icestudio_timestamp=${timestamp}" >> $GITHUB_OUTPUT - name: 'Upload ZIP/Aarch64' env: ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" + TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "Aarch64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" diff --git a/.github/workflows/main-windows.yml b/.github/workflows/main-windows.yml index d5236b270..866dc7398 100644 --- a/.github/workflows/main-windows.yml +++ b/.github/workflows/main-windows.yml @@ -54,7 +54,7 @@ jobs: # jq is bash command for reading properties from a json file - name: Install jq package - run: apt install jq + run: sudo apt install jq # Read the icestudio version from package.json (version property) - id: icestudio_json @@ -62,16 +62,16 @@ jobs: version=$(jq -r '.version' package.json) echo "icestudio_version=${version}" >> $GITHUB_OUTPUT - # Timestamp for the build + # Timestamp for the build - id: build_date run: | - content=`tr '\n' ' ' < app/buildinfo.json` - echo "buildJson=${content}" >> $GITHUB_OUTPUT + timestamp=$(jq -r '.ts' app/buildinfo.json) + echo "icestudio_timestamp=${timestamp}" >> $GITHUB_OUTPUT - name: 'Upload MSI/win64' env: ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" + TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "win64_MSI_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" @@ -81,7 +81,7 @@ jobs: - name: 'Upload ZIP/win64' env: ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}" + TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "win64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 837da9c76..2f1b1d312 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: # jq is bash command for reading properties from a json file - name: Install jq package - run: apt install jq + run: sudo apt install jq # Read the icestudio version from package.json (version property) - id: icestudio_json From b296c620c10fe4145ece02e510d8a5e1722e8044 Mon Sep 17 00:00:00 2001 From: Obijuan Date: Sat, 18 Feb 2023 00:38:41 +0100 Subject: [PATCH 11/13] github action linux: Fix an error with set-output --- .github/workflows/main.yml | 4 ++-- .github/workflows/release-stable.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f1b1d312..a18abf3e9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: 'Upload AppImage/linux64' env: - ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: @@ -70,7 +70,7 @@ jobs: - name: 'Upload ZIP/linux64' env: - ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: diff --git a/.github/workflows/release-stable.yml b/.github/workflows/release-stable.yml index c7ceff08a..4fa489824 100644 --- a/.github/workflows/release-stable.yml +++ b/.github/workflows/release-stable.yml @@ -244,7 +244,7 @@ jobs: # jq is bash command for reading properties from a json file - name: Install jq package - run: apt install jq + run: sudo apt install jq # Read the icestudio version from package.json (version property) - id: icestudio_json From 2a75e7905d30f2532ce3f807fc5253c1afb2f966 Mon Sep 17 00:00:00 2001 From: Obijuan Date: Sat, 18 Feb 2023 00:45:31 +0100 Subject: [PATCH 12/13] github action linux: Fix an error with set-output --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a18abf3e9..900ed50c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,7 +61,7 @@ jobs: - name: 'Upload AppImage/linux64' env: ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" - TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" + TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "linux64_AppImage_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" @@ -71,7 +71,7 @@ jobs: - name: 'Upload ZIP/linux64' env: ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" - TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" + TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "linux64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" From 8924a61a9f6a0c8f5b0b423d380631b8f0952c91 Mon Sep 17 00:00:00 2001 From: Obijuan Date: Sat, 18 Feb 2023 00:58:12 +0100 Subject: [PATCH 13/13] github action windows: Fix an error with set-output --- .github/workflows/build-windows-manual.yml | 8 ++++---- .github/workflows/main-aarch64.yml | 4 ++-- .github/workflows/main-windows.yml | 8 ++++---- .github/workflows/main.yml | 2 +- .github/workflows/release-stable.yml | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-windows-manual.yml b/.github/workflows/build-windows-manual.yml index 3f96d1d30..f376cb3a0 100644 --- a/.github/workflows/build-windows-manual.yml +++ b/.github/workflows/build-windows-manual.yml @@ -68,8 +68,8 @@ jobs: - name: 'Upload MSI/win64' env: - ICESTUDIO_VERSION:"${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" + TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "win64_MSI_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" @@ -78,8 +78,8 @@ jobs: - name: 'Upload ZIP/win64' env: - ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" + TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "win64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml index f0307accc..ed8add16b 100644 --- a/.github/workflows/main-aarch64.yml +++ b/.github/workflows/main-aarch64.yml @@ -57,8 +57,8 @@ jobs: - name: 'Upload ZIP/Aarch64' env: - ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" + TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "Aarch64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" diff --git a/.github/workflows/main-windows.yml b/.github/workflows/main-windows.yml index 866dc7398..818d37714 100644 --- a/.github/workflows/main-windows.yml +++ b/.github/workflows/main-windows.yml @@ -70,8 +70,8 @@ jobs: - name: 'Upload MSI/win64' env: - ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" + TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "win64_MSI_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" @@ -80,8 +80,8 @@ jobs: - name: 'Upload ZIP/win64' env: - ICESTUDIO_VERSION: "${{steps.icestudio_json.icestudio_version}}" - TIMESTAMP: "${{steps.build_date.icestudio_timestamp}}" + ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" + TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}" uses: 'actions/upload-artifact@v3' with: name: "win64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 900ed50c9..010b110ca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: 'Icestudio fot Linux' +name: 'Icestudio for Linux' # Controls when the action will run. on: diff --git a/.github/workflows/release-stable.yml b/.github/workflows/release-stable.yml index 4fa489824..58723981e 100644 --- a/.github/workflows/release-stable.yml +++ b/.github/workflows/release-stable.yml @@ -256,7 +256,7 @@ jobs: # -- It is read from the package.json - name: Get the Icestudio version env: - VERSION: "${{steps.icestudio_json.icestudio_version}}" + VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" run: | echo "VERSION: ${{ env.VERSION }}" @@ -267,7 +267,7 @@ jobs: uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - VERSION: "${{steps.icestudio_json.icestudio_version}}" + VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" with: upload_url: ${{ needs.build-LinWin.outputs.upload_url }} asset_path: "dist/icestudio-${{env.VERSION}}-aarch64.zip"