Merge branch 'main' into release/0.4

Author: maxcapodi78

.github/workflows/ci-build.yml

@@ -2,6 +2,10 @@ name: Documentation Build
 
 on: [pull_request, workflow_dispatch]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   docs_build:
     runs-on: ubuntu-20.04

.github/workflows/ironpython.yml

@@ -8,20 +8,23 @@ on:
   # Triggers the workflow on push or pull request events but only for the main branch
   pull_request:
     branches: [ main ]
-   
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: Windows
+    runs-on: [Windows, pyaedt]
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v2
 
       - name: 'Run Unit Tests in Ironpython'
-        timeout-minutes: 40
+        timeout-minutes: 45
         run: |
           $process = start-process 'cmd' -ArgumentList '/c .\_unittest_ironpython\run_unittests_batchmode.cmd' -PassThru
 

.github/workflows/ironpython_linux.yml

@@ -15,14 +15,17 @@ on:
         description: 'Linux Ironpython Manual Trigger'
   schedule:  # UTC at 0400
     - cron:  '0 4 * * *'
-   
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: Linux
+    runs-on: [Linux, pyaedt]
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       - uses: actions/checkout@v2
@@ -31,7 +34,7 @@ jobs:
         run: |
           export DISPLAY="127.0.0.1:1"
           chmod 777 _unittest_ironpython/run_unittests_batchmode_linux.cmd
-          timeout -k 2400s 2400s ./_unittest_ironpython/run_unittests_batchmode_linux.cmd
+          timeout -k 3600s 3600s ./_unittest_ironpython/run_unittests_batchmode_linux.cmd
           if [ $? -eq 124 ] ; then
             echo "ERROR: Timeout while waiting for the file _unittest_ironpython/tests_succeeded.log."
             exit 1

.github/workflows/label.yml

@@ -6,6 +6,9 @@ on:
     paths:
       - '../labels.yml'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
 

.github/workflows/main.yml

@@ -20,12 +20,16 @@ on:
       tags:
         description: 'Test scenario tags'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   full_documentation:
     # The type of runner that the job will run on
-    runs-on: Windows
+    runs-on: [Windows, pyaedt]
     strategy:
       matrix:
         python-version: [3.8]

.github/workflows/nightly-docs.yml

@@ -5,6 +5,10 @@ on:
   schedule:  # UTC at 0400
     - cron:  '0 4 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   docs_build:
     runs-on: ubuntu-20.04

.github/workflows/style.yml

@@ -3,6 +3,10 @@ name: Style Check
 
 on: [pull_request, workflow_dispatch]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   stylecheck:
     name: Style Check

.github/workflows/unit_tests.yml

@@ -1,5 +1,3 @@
-# This is a basic workflow to help you get started with Actions
-
 name: CI
 
 env:
@@ -16,21 +14,21 @@ env:
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
-    branches: [ main ]
     tags:
      - 'v*'
-     - v*
   pull_request:
     branches: [ main ]
 
-
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: Windows
+    runs-on: [Windows, pyaedt]
     strategy:
       matrix:
         python-version: [3.8]

.github/workflows/wheelhouse.yml

@@ -19,13 +19,16 @@ on:
      - 'v*'
      - v*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: Windows
+    runs-on: [Windows, pyaedt]
     strategy:
       matrix:
         python-version: [ 3.7, 3.8, 3.9]

_unittest/conftest.py

@@ -68,7 +68,7 @@
     with open(local_config_file) as f:
         config = json.load(f)
 else:
-    default_version = "2022.1"
+    default_version = "2022.2"
     if inside_desktop and "oDesktop" in dir(sys.modules["__main__"]):
         default_version = sys.modules["__main__"].oDesktop.GetVersion()[0:6]
     config = {