Merge pull request #264 from TwinFan/Next

v3.5.0 RealTraffic direct / Parked Aircraft / Refactored Network code
TwinFan · Feb 8, 2024 · 4d8a05b · 4d8a05b
2 parents 97a771b + 568a91f
commit 4d8a05b
Show file tree

Hide file tree

Showing 82 changed files with 7,160 additions and 582,796 deletions.
diff --git a/.github/actions/upload-plugin/action.yml b/.github/actions/upload-plugin/action.yml
@@ -28,8 +28,8 @@ runs:
         mv "${{ inputs.pdbFileName }}" "deploy-${{ inputs.pluginName }}/${{ inputs.pluginName }}/${{ inputs.archFolder }}"
       fi
   - name: Upload plugin
-    uses: actions/upload-artifact@v3
+    uses: actions/upload-artifact@v4
     with:
-      name: ${{ inputs.pluginName }}
+      name: ${{ inputs.pluginName }}-${{ env.platform }}
       path: deploy-${{ inputs.pluginName }}/*   # this way the top folder in the artifacts is "MyPlugin"
       if-no-files-found: error
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,101 +1,104 @@
-name: Build all Platforms
-
-on:
-  push:
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:        # Can also be called manually for whatever reason
-
-# Let's set all project specific definitions globally
-env:
-  PRJ_NAME:     LiveTraffic            # The plugin's name, expected to be the .xpl file's name and used as the plugin folder name
-
-jobs:
-  #####################################
-  # Linux with GCC
-  build-lin:
-    runs-on: ubuntu-20.04
-    env:
-      platform: lin
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
-      with:
-        submodules: 'recursive'
-    - name: Build
-      uses: ./.github/actions/build-lin
-      id: build
-      with:
-        pluginName: ${{ env.PRJ_NAME }}
-    - name: Upload Artifact
-      uses: ./.github/actions/upload-plugin
-      with:
-        pluginName:   ${{ env.PRJ_NAME }}
-        archFolder:   lin_x64
-        xplFileName:  "${{ steps.build.outputs.xpl-file-name }}"
-
-  #####################################
-  # MacOS with CMake/clang and sign/notarize in self-written script
-  build-mac:
-    runs-on: macos-11
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
-      with:
-        submodules: 'recursive'
-    - name: Build
-      uses: ./.github/actions/build-mac
-      id: build
-      with:
-        pluginName: ${{ env.PRJ_NAME }}
-    - name: Check if Secrets available
-      id: checksecrets
-      env:
-        MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      shell: bash
-      run: |
-        if [ "$MACOS_CERTIFICATE" == "" ]; then
-          echo "secretspresent=" >> $GITHUB_OUTPUT
-        else
-          echo "secretspresent=true" >> $GITHUB_OUTPUT
-        fi
-    - name: Codesign and Notarization
-      if: ${{ steps.checksecrets.outputs.secretspresent }}
-      uses: ./.github/actions/sign-notarize
-      with:
-        xplFileName:    ${{ steps.build.outputs.xpl-file-name }}
-        certificate:    ${{ secrets.MACOS_CERTIFICATE }}
-        certPwd:        ${{ secrets.MACOS_CERT_PWD }}
-        notarizeUser:   ${{ secrets.NOTARIZATION_USERNAME }}
-        notarizeTeam:   ${{ secrets.NOTARIZATION_TEAM }}
-        notarizeAppPwd: ${{ secrets.NOTARIZATION_PASSWORD }}
-    - name: Upload Artifact
-      uses: ./.github/actions/upload-plugin
-      with:
-        pluginName:   ${{ env.PRJ_NAME }}
-        archFolder:   mac_x64
-        xplFileName:  ${{ steps.build.outputs.xpl-file-name }}
-
-  #####################################
-  # Windows with MS Visual Studio
-  build-win:
-    runs-on: windows-2022
-    env:
-      platform: win
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
-      with:
-        submodules: 'recursive'
-    - name: Build
-      uses: ./.github/actions/build-win
-      id: build
-      with:
-        pluginName: ${{ env.PRJ_NAME }}
-    - name: Upload Artifact
-      uses: ./.github/actions/upload-plugin
-      with:
-        pluginName:   ${{ env.PRJ_NAME }}
-        archFolder:   win_x64
-        xplFileName:  "${{ steps.build.outputs.xpl-file-name }}"
-        pdbFileName:  "${{ steps.build.outputs.pdb-file-name }}"
+name: Build all Platforms
+
+on:
+  push:
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:        # Can also be called manually for whatever reason
+
+# Let's set all project specific definitions globally
+env:
+  PRJ_NAME:     LiveTraffic            # The plugin's name, expected to be the .xpl file's name and used as the plugin folder name
+  version_beta: ${{ github.ref != 'refs/heads/master' && '1' || '0' }}      # On non-master branches we build BETA versions
+
+jobs:
+  #####################################
+  # Linux with GCC
+  build-lin:
+    runs-on: ubuntu-20.04
+    env:
+      platform: lin
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
+      with:
+        submodules: 'recursive'
+    - name: Build
+      uses: ./.github/actions/build-lin
+      id: build
+      with:
+        pluginName: ${{ env.PRJ_NAME }}
+    - name: Upload Artifact
+      uses: ./.github/actions/upload-plugin
+      with:
+        pluginName:   ${{ env.PRJ_NAME }}
+        archFolder:   lin_x64
+        xplFileName:  "${{ steps.build.outputs.xpl-file-name }}"
+
+  #####################################
+  # MacOS with CMake/clang and sign/notarize in self-written script
+  build-mac:
+    runs-on: macos-12
+    env:
+      platform: mac
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
+      with:
+        submodules: 'recursive'
+    - name: Build
+      uses: ./.github/actions/build-mac
+      id: build
+      with:
+        pluginName: ${{ env.PRJ_NAME }}
+    - name: Check if Secrets available
+      id: checksecrets
+      env:
+        MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+      shell: bash
+      run: |
+        if [ "$MACOS_CERTIFICATE" == "" ]; then
+          echo "secretspresent=" >> $GITHUB_OUTPUT
+        else
+          echo "secretspresent=true" >> $GITHUB_OUTPUT
+        fi
+    - name: Codesign and Notarization
+      if: ${{ steps.checksecrets.outputs.secretspresent }}
+      uses: ./.github/actions/sign-notarize
+      with:
+        xplFileName:    ${{ steps.build.outputs.xpl-file-name }}
+        certificate:    ${{ secrets.MACOS_CERTIFICATE }}
+        certPwd:        ${{ secrets.MACOS_CERT_PWD }}
+        notarizeUser:   ${{ secrets.NOTARIZATION_USERNAME }}
+        notarizeTeam:   ${{ secrets.NOTARIZATION_TEAM }}
+        notarizeAppPwd: ${{ secrets.NOTARIZATION_PASSWORD }}
+    - name: Upload Artifact
+      uses: ./.github/actions/upload-plugin
+      with:
+        pluginName:   ${{ env.PRJ_NAME }}
+        archFolder:   mac_x64
+        xplFileName:  ${{ steps.build.outputs.xpl-file-name }}
+
+  #####################################
+  # Windows with MS Visual Studio
+  build-win:
+    runs-on: windows-2022
+    env:
+      platform: win
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
+      with:
+        submodules: 'recursive'
+    - name: Build
+      uses: ./.github/actions/build-win
+      id: build
+      with:
+        pluginName: ${{ env.PRJ_NAME }}
+    - name: Upload Artifact
+      uses: ./.github/actions/upload-plugin
+      with:
+        pluginName:   ${{ env.PRJ_NAME }}
+        archFolder:   win_x64
+        xplFileName:  "${{ steps.build.outputs.xpl-file-name }}"
+        pdbFileName:  "${{ steps.build.outputs.pdb-file-name }}"