Merge branch 'FPGAwars:develop' into develop

FPGAwars · Feb 18, 2023 · 9f5766b · 9f5766b
2 parents a2b6bb8 + 8924a61
commit 9f5766b
Show file tree

Hide file tree

Showing 11 changed files with 1,674 additions and 127 deletions.
diff --git a/.github/workflows/build-windows-manual.yml b/.github/workflows/build-windows-manual.yml
@@ -8,20 +8,20 @@ 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:
 
       # 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'
+          node-version: '19.3.0'
 
       - name: Install npm dependencies
         run:   npm install 
@@ -44,36 +44,43 @@ 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: sudo 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 "::set-output name=packageJson::$content"
+          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: |
           content=`tr '\n' ' ' < app/buildinfo.json`
-          echo "::set-output name=buildJson::$content"
+          echo "buildJson=${content}" >> $GITHUB_OUTPUT
           
       - name: 'Upload MSI/win64'
         env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: 'actions/upload-artifact@v2'
+          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}}"
           path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-win64.exe"
           if-no-files-found: error
 
       - name: 'Upload ZIP/win64'
         env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: 'actions/upload-artifact@v2'
+          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}}"
           path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-win64.zip"

diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml
@@ -16,20 +16,20 @@ 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:
 
       # 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'
+          node-version: '19.3.0'
 
       - name: Install npm dependencies
         run:   npm install --legacy-peer-deps 
@@ -38,27 +38,28 @@ 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: sudo 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 "::set-output name=packageJson::$content"
+          version=$(jq -r '.version' package.json)
+          echo "icestudio_version=${version}" >> $GITHUB_OUTPUT
     
       # Timestamp for the build
       - id: build_date
         run: |
-          content=`tr '\n' ' ' < app/buildinfo.json`
-          echo "::set-output name=buildJson::$content"h
+          timestamp=$(jq -r '.ts' app/buildinfo.json)
+          echo "icestudio_timestamp=${timestamp}" >> $GITHUB_OUTPUT
           
       - name: 'Upload ZIP/Aarch64'
         env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: 'actions/upload-artifact@v2'
+          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}}"
           path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-aarch64.zip"

diff --git a/.github/workflows/main-osx.yml b/.github/workflows/main-osx.yml
@@ -23,14 +23,14 @@ 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: '18.9.1'
+          node-version: '19.3.0'
       - name: Install npm dependencies
         run:   npm install --legacy-peer-deps 
       - name: Build OSX packages
@@ -42,19 +42,20 @@ 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:
           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 +65,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
@@ -16,20 +16,20 @@ 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:
 
       # 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'
+          node-version: '19.3.0'
 
       - name: Install npm dependencies
         run:   npm install --legacy-peer-deps 
@@ -51,37 +51,38 @@ 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: sudo 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 "::set-output name=packageJson::$content"
+          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 "::set-output name=buildJson::$content"
+          timestamp=$(jq -r '.ts' app/buildinfo.json)
+          echo "icestudio_timestamp=${timestamp}" >> $GITHUB_OUTPUT
           
       - name: 'Upload MSI/win64'
         env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: 'actions/upload-artifact@v2'
+          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}}"
           path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-win64.exe"
           if-no-files-found: error
 
       - name: 'Upload ZIP/win64'
         env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: 'actions/upload-artifact@v2'
+          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}}"
           path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-win64.zip"

diff --git 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:
@@ -18,21 +18,21 @@ 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:
 
       # 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'
+          node-version: '19.3.0'
 
       - name: Install npm dependencies
         run:   npm install --legacy-peer-deps
@@ -42,36 +42,37 @@ 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: sudo 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 "::set-output name=packageJson::$content"
+          version=$(jq -r '.version' package.json)
+          echo "icestudio_version=${version}" >> $GITHUB_OUTPUT
     
       # Timestamp for the build
       - id: build_date
         run: |
-          content=`tr '\n' ' ' < app/buildinfo.json`
-          echo "::set-output name=buildJson::$content"
+          timestamp=$(jq -r '.ts' app/buildinfo.json)
+          echo "icestudio_timestamp=${timestamp}" >> $GITHUB_OUTPUT
           
       - name: 'Upload AppImage/linux64'
         env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: 'actions/upload-artifact@v2'
+          ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}" 
+          TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}"
+        uses: 'actions/upload-artifact@v3'
         with:
           name: "linux64_AppImage_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}"
           path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-linux64.AppImage"
           if-no-files-found: error
 
       - name: 'Upload ZIP/linux64'
         env:
-          ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
-          TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
-        uses: 'actions/upload-artifact@v2'
+          ICESTUDIO_VERSION: "${{steps.icestudio_json.outputs.icestudio_version}}"
+          TIMESTAMP: "${{steps.build_date.outputs.icestudio_timestamp}}"
+        uses: 'actions/upload-artifact@v3'
         with:
           name: "linux64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}"
           path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-linux64.zip"