Merge pull request #982 from virtualsatellite/integration

Release 4.13.0
virtualsatellite · Apr 23, 2021 · 08b129c · 08b129c
2 parents bda429e + a808143
commit 08b129c
Show file tree

Hide file tree

Showing 641 changed files with 15,750 additions and 5,038 deletions.
diff --git a/.codebeatsettings b/.codebeatsettings
@@ -7,6 +7,7 @@
         "TOTAL_COMPLEXITY": [200, 280, 380, 500],
         "TOTAL_LOC": [350, 400, 500, 600],
         "TOO_MANY_FUNCTIONS": [70, 80, 90, 100],
-        "BLOCK_NESTING": [5, 6, 7, 8]
+        "BLOCK_NESTING": [5, 6, 7, 8],
+        "TOO_MANY_IVARS": [8, 10, 14, 20]
     }
 }
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,324 @@
+# --------------------------------------------
+# This is a basic workflow to help you get started with Actions
+# --------------------------------------------
+name: Build
+
+on:
+  # --------------------------------------------
+  # Controls when the automatic build job will be run.
+  # By default uses the default branch. Runs at 20:37 UTC.
+  # Virtual Satellite Core should always run quite early,
+  # so all artifacts are deployed for other builds such as CEF
+  # --------------------------------------------
+  schedule:
+    - cron: '37 20 * * *'
+
+  # --------------------------------------------
+  # Run this workflow every time a new commit pushed to the repository
+  # --------------------------------------------
+  push:
+
+  # --------------------------------------------
+  # Run this workflow every time a pull request is created or commited to it
+  # --------------------------------------------
+  pull_request:
+    branches:
+      - '**'
+
+env:
+  # -------------------------------------------------------------
+  # Setting up locale to have correct keyboard mapping for swtbot
+  # -------------------------------------------------------------
+  LANG: "en_US.UTF-8"
+# --------------------------------------------
+# Defines the list of jobs
+# --------------------------------------------
+jobs:
+  # --------------------------------------------
+  # Verify Job
+  #---------------------------------------------
+  verify:
+    name: Verify
+    runs-on: ubuntu-18.04
+
+    steps:
+      # --------------------------------------------
+      # Checks out a copy of the repository
+      # --------------------------------------------
+      - name: Setup - Checkout code
+        uses: actions/checkout@v2
+
+      # --------------------------------------------
+      # Run a quick sanity check if all commits are
+      # handed in by known users
+      #---------------------------------------------
+      - name: Verify - Authors Sanity Check
+        uses: virtualsatellite/ci-actions/ci-verify-authors-action@v2
+      # Actions can also be accessed by other refs such as the latest from branch when using @master such as: 
+      # uses: virtualsatellite/ci-actions/ci-verify-authors-action@master   
+  # -----------------------------------------------------
+  # Build and Test - SpotBugs Job
+  # -----------------------------------------------------
+  spotbugs:
+    name: Build and Test - Spotbugs
+    runs-on: ubuntu-18.04
+    needs: [verify]
+
+    steps:
+      # --------------------------------------------
+      # Checks out a copy of the repository
+      # --------------------------------------------
+      - name: Setup - Checkout code
+        uses: actions/checkout@v2
+
+      # --------------------------------------------
+      # Setup caching for m2 repository
+      # --------------------------------------------
+      - name: Setup - Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/
+          key: ${{ runner.os }}-local-maven-spotbugs-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-local-maven-spotbugs-
+            ${{ runner.os }}-local-maven-
+     
+      # --------------------------------------------
+      # Perform various setup operations
+      # --------------------------------------------      
+      - name: Setup - Prepare OS
+        uses: virtualsatellite/ci-actions/ci-setup-action@v2
+
+      # --------------------------------------------
+      # Development and Feature branches
+      # --------------------------------------------
+      - name: Build - Build and Deploy Decision
+        id: build_decision
+        uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
+
+      # --------------------------------------------
+      # Development and Feature branches
+      # --------------------------------------------
+      - name: Build and Test - Spotbugs
+        uses: virtualsatellite/ci-actions/ci-maven-build-action@v2
+        with:
+          build_job: spotbugs
+          build_profile: ${{ steps.build_decision.outputs.build_type }}
+
+  # -----------------------------------------------------
+  # Build and Test - Surefire Job
+  # -----------------------------------------------------
+  surefire:
+    name: Build and Test - Surefire
+    runs-on: ubuntu-18.04
+    needs: [verify]
+
+    steps:
+      # --------------------------------------------
+      # Checks out a copy of your repository
+      # --------------------------------------------
+      - name: Setup - Checkout code
+        uses: actions/checkout@v2
+
+      # --------------------------------------------
+      # Setup caching for m2 repository
+      # --------------------------------------------
+      - name: Setup - Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/
+          key: ${{ runner.os }}-local-maven-surefire-{{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-local-maven-surefire-
+            ${{ runner.os }}-local-maven-
+
+      # --------------------------------------------
+      # Perform various setup operations
+      # --------------------------------------------      
+      - name: Setup - Prepare OS
+        uses: virtualsatellite/ci-actions/ci-setup-action@v2
+        with:
+           xvfb: -x
+           pkgs_file: apt_vtk_zmq_packages
+
+      # --------------------------------------------
+      # Development and Feature branches
+      # --------------------------------------------
+      - name: Build - Build and Deploy Decision
+        id: build_decision
+        uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
+
+      # --------------------------------------------
+      # Development and Feature branches
+      # --------------------------------------------
+      - name: Build and Test - Surefire
+        uses: virtualsatellite/ci-actions/ci-maven-build-action@v2
+        with:
+          build_job: sureheadless
+          build_profile: ${{ steps.build_decision.outputs.build_type }}
+
+      # --------------------------------------------
+      # Upload SWTBout screenshots to github artifacts
+      # --------------------------------------------
+      - name: Build and Test - Upload SWTBot Screenshots on Failure
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: SWTBot Screenshots
+          path: 
+            swtbot/*
+
+      # --------------------------------------------
+      # Upload Surefire Reports to github artifacts
+      # --------------------------------------------            
+      - name: Build and Test - Upload Surefire Reports on Failure
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: Surefire Reports
+          path: 
+            ./**/target/surefire-reports/*
+
+  # -----------------------------------------------------
+  # Build and Test - Checkstyle Job
+  # -----------------------------------------------------
+  checkstyle:
+    name: Build and Test - Checkstyle
+    runs-on: ubuntu-18.04
+    needs: [verify]
+
+    steps:
+      # --------------------------------------------
+      # Checks out a copy of your repository
+      # --------------------------------------------
+      - name: Setup - Checkout code
+        uses: actions/checkout@v2
+
+      # --------------------------------------------
+      # Setup caching for m2 repository
+      # --------------------------------------------      
+      - name: Setup - Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/
+          key: ${{ runner.os }}-local-maven-checkstyle-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-local-maven-checkstyle-
+            ${{ runner.os }}-local-maven-
+            
+    
+      # --------------------------------------------
+      # Perform various setup operations
+      # --------------------------------------------      
+      - name: Setup - Prepare OS
+        uses: virtualsatellite/ci-actions/ci-setup-action@v2
+
+      # --------------------------------------------
+      # Development and Feature branches
+      # --------------------------------------------
+      - name: Build - Build and Deploy Decision
+        id: build_decision
+        uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
+
+      # --------------------------------------------
+      # Development and Feature branches
+      # --------------------------------------------
+      - name: Build and Test - Checkstyle
+        uses: virtualsatellite/ci-actions/ci-maven-build-action@v2
+        with:
+          build_job: checkstyle
+          build_profile: ${{ steps.build_decision.outputs.build_type }}
+
+  # -----------------------------------------------------
+  # Build, Assemble and Deploy Job
+  # -----------------------------------------------------
+  deploy:
+    name: Build, Assemble and Deploy
+    runs-on: ubuntu-18.04
+    needs: [spotbugs, surefire, checkstyle]
+
+    steps:
+      # --------------------------------------------
+      # Checks out a copy of your repository
+      # --------------------------------------------
+      - name: Setup - Checkout code
+        uses: actions/checkout@v2
+
+      # --------------------------------------------
+      # Setup caching for m2 repository
+      # --------------------------------------------
+      - name: Setup - Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/
+          key: ${{ runner.os }}-local-maven-deploy-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-local-maven-deploy-
+            ${{ runner.os }}-local-maven-
+
+      # --------------------------------------------
+      # Perform various setup operations
+      # --------------------------------------------
+      - name: Setup - Prepare OS
+        uses: virtualsatellite/ci-actions/ci-setup-action@v2
+
+      # --------------------------------------------
+      # Development and Feature branches
+      # --------------------------------------------
+      - name: Build - Build and Deploy Decision
+        id: build_decision
+        uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
+
+      # --------------------------------------------
+      # Development and Feature branches
+      # --------------------------------------------
+      - name: Build - Assemble
+        uses: virtualsatellite/ci-actions/ci-maven-build-action@v2
+        with:
+          build_job: assemble
+          build_profile: ${{ steps.build_decision.outputs.build_type }}
+
+      # --------------------------------------------
+      # Upload SWTBout screenshots to github artifacts
+      # --------------------------------------------
+      - name: Build - Upload Build Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Deployable Applications
+          path: |
+            deploy/**/*.zip
+            deploy/**/*.tar.gz
+          retention-days: 3
+
+      # ---------------------------------------------
+      # Deploying to github releases
+      # --------------------------------------------
+      - name: Build - Deploy GH
+        uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v2
+        with:
+          build_profile: ${{ steps.build_decision.outputs.build_type }}
+          gh_token: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ steps.build_decision.outputs.deploy_type == 'deploy' }}
+
+      # ----------------------------------------------
+      # SF Deploy still to be done
+      # ----------------------------------------------
+      - name: Build - Deploy SF (Core)
+        uses: virtualsatellite/ci-actions/ci-deploy-sf-product-action@v2
+        with:
+          build_profile: ${{ steps.build_decision.outputs.build_type }}
+          openssl_pass: ${{ secrets.SF_SSH_KEY_OPENSSL_PASS }}
+          ssh_key_pass: ${{ secrets.SF_SSH_KEY_PASS }}
+          local_dir: VirSat4_Core_Application
+          remote_dir: virtualsatellite/VirtualSatellite4-Core
+        if: ${{ steps.build_decision.outputs.deploy_type == 'deploy' }}
+
+      - name: Build - Deploy SF (IDE Tools)
+        uses: virtualsatellite/ci-actions/ci-deploy-sf-product-action@v2
+        with:
+          build_profile: ${{ steps.build_decision.outputs.build_type }}
+          openssl_pass: ${{ secrets.SF_SSH_KEY_OPENSSL_PASS }}
+          ssh_key_pass: ${{ secrets.SF_SSH_KEY_PASS }}
+          local_dir: VirSat4_Dvlm_ConceptIDE
+          remote_dir: virtualsatellite/VirtualSatellite4-DVLM
+        if: ${{ steps.build_decision.outputs.deploy_type == 'deploy' }}
diff --git a/.mailmap b/.mailmap
@@ -22,3 +22,9 @@ Anna-Lena-DLR <anna-lena.gefke@dlr.de>			Anna-Lena Gefke <anna-lena.gefke@dlr.de
 dianapeters-dlr <diana.peters@dlr.de>			Diana Peters <diana.peters@dlr.de>
 
 watollah-dlr <Hannes.Watolla@dlr.de>			wato_ha <wato_ha@SC-010058.intra.dlr.de>
+
+maurpa <Paulina.Maurer@dlr.de>					maur_pa <maur_pa@SC-010203.intra.dlr.de>
+
+kempra <Raphael.Kempter@dlr.de>					kemp_ra <kemp_ra@SC-010118.intra.dlr.de>
+
+GeorgeNasrDLR <george.nasralla@dlr.de>			George NasrAlla <george.nasralla@dlr.de>