Resolve conflicts

.github/workflows/ci.yml

@@ -25,55 +25,57 @@ jobs:
       matrix:
         os: [ ubuntu-latest ] # For CI/CD running on *nix is sufficient
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 11, 17 ]
       fail-fast: false
 
     steps:
     # Checkout the Pull Request source and put it in: ./mekhq
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: mekhq
 
     # Setup composite build for MekHQ
     # See: https://github.com/MegaMek/megamek/wiki/Working-With-Gradle
-    - name: Setup Composite Build for MekHQ
-      run: |
-        echo "includeBuild '../megamek'" >./mekhq/settings_local.gradle
-        echo "includeBuild '../megameklab'" >>./mekhq/settings_local.gradle
+# Disabled - 25-Jun-2022 - Causing regular build failures and . 
+#    - name: Setup Composite Build for MekHQ
+#      run: |
+#        echo "includeBuild '../megamek'" >./mekhq/settings_local.gradle
+#        echo "includeBuild '../megameklab'" >>./mekhq/settings_local.gradle
 
     # Find the repo and branch to use for MM
     #
     # Output variables:
     #
     #    - mmRepo: The MM repository to use.
     #    - mmBranch: The MM branch to use.
-    - name: Find the Right MegaMek Branch
-      id: find_mm
+#    - name: Find the Right MegaMek Branch
+#      id: find_mm
       # Override bash so that it doesn't fail fast (the default)
       # if we can't find the branch
-      shell: bash {0}
+#      shell: bash {0}
       # This shell script searches the PR submitter's MM repo for
       # a branch that has the same name as the current PR branch.
       # If found it sets the `mmRepo` and `mmBranch` step output variables
       # to that branch.
-      run: |
-        git ls-remote --exit-code --heads ${{ github.event.pull_request.head.repo.owner.html_url }}/megamek.git ${{ github.event.pull_request.head.ref }}
-        if [ "$?" == "0" ]
-        then
-          echo "${{ github.event.pull_request.head.repo.owner.html_url }}" | awk -F/ '{print "::set-output name=mmRepo::" $4 "/megamek"}'
-          echo "::set-output name=mmBranch::${{ github.event.pull_request.head.ref }}"
-        else
-          echo "::set-output name=mmRepo::MegaMek/megamek"
-          echo "::set-output name=mmBranch::master"
-        fi
-        exit 0
+#      run: |
+#        git ls-remote --exit-code --heads ${{ github.event.pull_request.head.repo.owner.html_url }}/megamek.git ${{ github.event.pull_request.head.ref }}
+#        if [ "$?" == "0" ]
+#        then
+#          echo "${{ github.event.pull_request.head.repo.owner.html_url }}" | awk -F/ '{print "::set-output name=mmRepo::" $4 "/megamek"}'
+#          echo "::set-output name=mmBranch::${{ github.event.pull_request.head.ref }}"
+#        else
+#          echo "::set-output name=mmRepo::MegaMek/megamek"
+#          echo "::set-output name=mmBranch::master"
+#        fi
+#        exit 0
 
     # Checkout the latest MegaMek source and put it in: ./megamek
     - name: Checkout MegaMek
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
-        repository: ${{ steps.find_mm.outputs.mmRepo }}
-        ref:  ${{ steps.find_mm.outputs.mmBranch }}
+#        repository: ${{ steps.find_mm.outputs.mmRepo }}
+#        ref:  ${{ steps.find_mm.outputs.mmBranch }}
+        repository: MegaMek/megamek
         path: megamek
 
     # Find the repo and branch to use for MML
@@ -82,44 +84,45 @@ jobs:
     #
     #    - mmlRepo: The MML repository to use.
     #    - mmlBranch: The MML branch to use.
-    - name: Find the Right MegaMekLab Branch
-      id: find_mml
+#    - name: Find the Right MegaMekLab Branch
+#      id: find_mml
       # Override bash so that it doesn't fail fast (the default)
       # if we can't find the branch
-      shell: bash {0}
+#      shell: bash {0}
       # This shell script searches the PR submitter's MML repo for
       # a branch that has the same name as the current PR branch.
       # If found it sets the mmlRepo and mmlBranch step output variables
       # to that branch.
-      run: |
-        git ls-remote --exit-code --heads ${{ github.event.pull_request.head.repo.owner.html_url }}/megameklab.git ${{ github.event.pull_request.head.ref }}
-        if [ "$?" == "0" ]
-        then
-          echo "${{ github.event.pull_request.head.repo.owner.html_url }}" | awk -F/ '{print "::set-output name=mmlRepo::" $4 "/megameklab"}'
-          echo "::set-output name=mmlBranch::${{ github.event.pull_request.head.ref }}"
-        else
-          echo "::set-output name=mmlRepo::MegaMek/megameklab"
-          echo "::set-output name=mmlBranch::master"
-        fi
-        exit 0
+#      run: |
+#        git ls-remote --exit-code --heads ${{ github.event.pull_request.head.repo.owner.html_url }}/megameklab.git ${{ github.event.pull_request.head.ref }}
+#        if [ "$?" == "0" ]
+#        then
+#          echo "${{ github.event.pull_request.head.repo.owner.html_url }}" | awk -F/ '{print "::set-output name=mmlRepo::" $4 "/megameklab"}'
+#          echo "::set-output name=mmlBranch::${{ github.event.pull_request.head.ref }}"
+#        else
+#          echo "::set-output name=mmlRepo::MegaMek/megameklab"
+#          echo "::set-output name=mmlBranch::master"
+#        fi
+#        exit 0
 
     # Checkout the latest MegaMekLab source and put it in: ./megameklab
     - name: Checkout MegaMekLab
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
-        repository: ${{ steps.find_mml.outputs.mmlRepo }}
-        ref: ${{ steps.find_mml.outputs.mmlBranch }}
+#        repository: ${{ steps.find_mml.outputs.mmlRepo }}
+#        ref: ${{ steps.find_mml.outputs.mmlBranch }}
+        repository: MegaMek/megameklab
         path: megameklab
 
     # Setup composite build for MegaMekLab
     # See: https://github.com/MegaMek/megamek/wiki/Working-With-Gradle
-    - name: Setup Composite Build for MegaMekLab
-      run: |
-        echo "if (gradle.parent == null) includeBuild '../megamek'" >./megameklab/settings_local.gradle
+#    - name: Setup Composite Build for MegaMekLab
+#      run: |
+#        echo "if (gradle.parent == null) includeBuild '../megamek'" >./megameklab/settings_local.gradle
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
@@ -141,23 +144,23 @@ jobs:
     # Output Variables:
     #    - buildScanUri
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
-        arguments: clean build --stacktrace --scan
+        arguments: clean build --no-build-cache --info --continue --stacktrace --max-workers=1 --scan
         build-root-directory: mekhq
 
     # If the build step fails, try to upload any test logs in case it was a unit test failure.
     # The logs will be relative to the ./mekhq directory.
-    - name: Upload Test Logs on Failure
-      uses: actions/upload-artifact@v2.2.4
-      if: failure()
-      with:
-        name: cd-failure-logs
-        path: ./mekhq/MekHQ/build/reports/
+#    - name: Upload Test Logs on Failure
+#      uses: actions/upload-artifact@v3
+#      if: failure()
+#      with:
+#        name: cd-failure-logs
+#        path: ./mekhq/MekHQ/build/reports/
 
     # Upload our Code Coverage Reports to CodeCov.io
     - name: CodeCov.io Coverage Report
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
       with:
         directory: ./mekhq/MekHQ/build/reports/jacoco/test
         fail_ci_if_error: false
@@ -178,14 +181,14 @@ jobs:
     # Put the Windows Release in an artifact
     # NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
     - name: Upload Windows Release
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       with:
         name: mhq-release-win-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
-        path: ./mekhq/MekHQ/build/distributions/*.zip
+        path: ./mekhq/MekHQ/build/distributions/mekhq-windows-*.zip
 
     # Put the non-Windows release in an artifact
     - name: Upload Nix/Mac Release
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       with:
         name: mhq-release-nix-mac-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
         path: ./mekhq/MekHQ/build/distributions/*.tar

.github/workflows/code-coverage.yml

@@ -26,11 +26,11 @@ jobs:
       matrix:
         os: [ ubuntu-latest ] # For Code QL running on *nix is sufficient
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 17 ]
 
     steps:
     # Checkout the Pull Request source and put it in: ./mekhq
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: mekhq
 
@@ -43,14 +43,14 @@ jobs:
 
     # Checkout the latest MegaMek source and put it in: ./megamek
     - name: Checkout MegaMek
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megamek
         path: megamek
 
     # Checkout the latest MegaMekLab source and put it in: ./megameklab
     - name: Checkout MegaMekLab
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megameklab
         path: megameklab
@@ -63,7 +63,7 @@ jobs:
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
@@ -85,24 +85,24 @@ jobs:
     # Output Variables:
     #    - buildScanUri
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
-        arguments: clean build --stacktrace --scan
+        arguments: clean build --no-build-cache --info --stacktrace --max-workers=1 --scan
         build-root-directory: mekhq
 
     # If the build step fails, try to upload any test logs in case it was a unit test failure.
     #
     # The logs will be relative to the ./mekhq directory.
     - name: Upload Test Logs on Failure
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: cd-failure-logs
         path: ./mekhq/MekHQ/build/reports/
 
     # Upload our Code Coverage Reports to CodeCov.io
     - name: CodeCov.io Coverage Report
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
       with:
         directory: ./mekhq/MekHQ/build/reports/jacoco/test
         fail_ci_if_error: false

.github/workflows/codeql-analysis.yml

@@ -30,23 +30,23 @@ jobs:
         os: [ ubuntu-latest ] # For Code QL running on *nix is sufficient
         language: [ 'java' ]
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 17 ]
       fail-fast: false
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild MekHQ
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.github/workflows/nightly-ci.yml

@@ -23,14 +23,14 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
         java-distribution: [ temurin ]
-        java-version: [ 11 ]
+        java-version: [ 11, 17 ]
       fail-fast: false
 
     name: Nightly MekHQ CI ${{ matrix.os }} on ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
 
     steps:
     # Checkout the latest source and put it in: ./mekhq
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         path: mekhq
 
@@ -43,14 +43,14 @@ jobs:
 
     # Checkout the latest MegaMek source and put it in: ./megamek
     - name: Checkout MegaMek
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megamek
         path: megamek
 
     # Checkout the latest MegaMekLab source and put it in: ./megameklab
     - name: Checkout MegaMekLab
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megameklab
         path: megameklab
@@ -63,7 +63,7 @@ jobs:
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
@@ -76,13 +76,13 @@ jobs:
 
     # Include --stacktrace to make some build failures easier to figure out.
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
-        arguments: clean build -x test --continue --stacktrace --scan
+        arguments: clean build -x test --continue --stacktrace --max-workers=1 --scan
         build-root-directory: mekhq
 
     - name: Upload Test Logs on Failure
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: ${{ matrix.os }}-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}-ci-failure-logs
@@ -92,7 +92,7 @@ jobs:
     #
     # NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
     - name: Upload Nix/Mac Releases
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       if: always() && matrix.os == 'ubuntu-latest'
       with:
         name: mhq-release-nix-mac-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
@@ -102,8 +102,8 @@ jobs:
     #
     # NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
     - name: Upload Windows Release
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       if: always() && matrix.os == 'windows-latest'
       with:
         name: mhq-release-win-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
-        path: mekhq/MekHQ/build/distributions/*.zip
+        path: mekhq/MekHQ/build/distributions/mekhq-windows-*.zip