Merge pull request #4603 from rjhancock/duplicate-file-fixes

Removed duplicate files in packaged build
MegaMek · Aug 10, 2024 · a16a4fb · a16a4fb
2 parents 5ab5959 + 9183b33
commit a16a4fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,10 +45,6 @@ jobs:
           fi
           exit 0
 
-      - name: Add MMRevision file
-        run: |
-          echo ${{ steps.find_mm.outputs.mmBranch }} >> mekhq/MekHQ/mm-revision.txt
-
       - name: Checkout MegaMek
         uses: actions/checkout@v4
         with:
@@ -71,10 +67,6 @@ jobs:
           fi
           exit 0
 
-      - name: Add MMLRevision file
-        run: |
-          echo ${{ steps.find_mml.outputs.mmlBranch }} >> mekhq/MekHQ/mml-revision.txt
-
       - name: Checkout MegaMekLab
         uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -15,6 +15,10 @@ jobs:
   analyze:
     name: Analyze
     strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java-distribution: [temurin]
+        java-version: [17]
       fail-fast: false
     runs-on: [ubuntu-latest]
 

diff --git a/MekHQ/build.gradle b/MekHQ/build.gradle
@@ -234,7 +234,9 @@ distributions {
             }
 
             // MegaMekLab Includes
-            from ("${mmlDir}/megameklab/build/files")
+            from ("${mmlDir}/megameklab/build/files") {
+                exclude 'data/mechfiles'
+            }
             from ("${mmlDir}/megameklab/build/launch4j/lib") {
                 into "${lib}"
             }