Add build-with-entropy pipeline (#1384)

* Try entropy build * Fix * Updates * Remove file * Fix * Add seed parameter to entropy.sh * echo SEED used * Try build pipeline changes * Add python setup * Fix pipeline * Increase number of samples, add entropy to isle and config * Try 32 samples * Empty commit for another CI run * Try 50 samples * Empty commit for another CI run * Empty commit for another CI run * Empty commit for another CI run * Empty commit for another CI run * Empty commit for another CI run * Empty commit for another CI run * Empty commit for another CI run * Empty commit for another CI run * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Trigger CI with 100 entropy samples * Update * Echo seed * Update text * Fix requirements.txt * Cancel previous CI workflows * Try only build,yml * Empty commit - should stop earlier build * Fix upload
2025-10-22 16:04:17 +00:00 · 2025-03-05 15:25:39 -07:00
parent 06d23a4e99
commit ca1c8b2be6
3 changed files with 193 additions and 9 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,6 +2,10 @@ name: Build

 on: [push, pull_request]

+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
  fetch-deps:
    name: Download original binaries
@@ -100,9 +104,104 @@ jobs:
          build/LEGO1.DLL
          build/LEGO1.PDB

+  build-with-entropy:
+    name: 'MSVC 4.20 with entropy'
+    needs: [fetch-deps]
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        instance: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+                   10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+                   20, 21, 22, 23, 24, 25, 26, 27, 28, 29]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - uses: actions/checkout@v4
+      with:
+        repository: itsmattkc/msvc420
+        path: msvc420
+
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        # Use minimum supported version
+        cmake-version: '3.15.x'
+
+    - name: Patch MSVC 4.2
+      run: |
+        tools/patch_c2.py msvc420/bin/C2.EXE
+
+    - name: Generate Entropy
+      shell: bash
+      run: |
+        # Get the first 8 characters of the SHA (enough for a decent seed)
+        SHA_PREFIX=$(echo "${{ github.sha }}" | cut -c 1-8)
+        ENTROPY_SEED=$((16#$SHA_PREFIX + ${{ matrix.instance }}))
+
+        echo "Using seed: $ENTROPY_SEED"
+        python3 tools/entropy.py $ENTROPY_SEED > entropy.h
+
+    - name: Build
+      shell: cmd
+      run: |
+        call .\msvc420\bin\VCVARS32.BAT x86
+        cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DISLE_INCLUDE_ENTROPY=ON -G "NMake Makefiles"
+        cmake --build build
+
+    - name: Restore cached original binaries
+      id: cache-original-binaries
+      uses: actions/cache/restore@v4
+      with:
+        enableCrossOsArchive: true
+        path: legobin
+        key: legobin
+        
+    - name: Install python packages
+      shell: bash
+      run: |
+        pip install -r tools/requirements.txt
+  
+    - name: Detect binaries
+      run: |
+        reccmp-project detect --what original   --search-path legobin
+        reccmp-project detect --what recompiled --search-path build
+
+    - name: Summarize Accuracy
+      shell: bash
+      run: |
+        reccmp-reccmp --target CONFIG --json CONFIGPROGRESS.json
+        reccmp-reccmp --target ISLE --json ISLEPROGRESS.json
+        reccmp-reccmp --target LEGO1 --json LEGO1PROGRESS.json
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@main
+      with:
+        name: Win32-Entropy-${{ matrix.instance }}
+        path: |
+          CONFIGPROGRESS.json
+          ISLEPROGRESS.json
+          LEGO1PROGRESS.json
+
+  merge-entropy-artifacts:
+    name: 'Merge entropy artifacts'
+    runs-on: ubuntu-latest
+    needs: build-with-entropy
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: Win32-Entropy
+          pattern: Win32-Entropy-*
+          separate-directories: true
+          
  compare:
    name: Compare with master
-    needs: [build, fetch-deps]
+    needs: [build, merge-entropy-artifacts, fetch-deps]
    runs-on: windows-latest
    steps:
    - uses: actions/checkout@main
@@ -113,8 +212,13 @@ jobs:

    - uses: actions/download-artifact@main
      with:
-       name: Win32
-       path: build
+        name: Win32
+        path: build
+
+    - uses: actions/download-artifact@main
+      with:
+        name: Win32-Entropy
+        path: build-entropy

    - name: Restore cached original binaries
      id: cache-original-binaries
@@ -156,6 +260,28 @@ jobs:
        reccmp-reccmp --target ISLE --diff ISLEPROGRESS-old.json || echo "Current master not found"
        reccmp-reccmp --target LEGO1 --diff LEGO1PROGRESS-old.json || echo "Current master not found"

+    - name: Aggregate Accuracy
+      shell: bash
+      run: |
+        reccmp-aggregate --samples $(find build-entropy -type f -name "CONFIGPROGRESS.json") --output CONFIGPROGRESS-agg.json
+        reccmp-aggregate --samples $(find build-entropy -type f -name "ISLEPROGRESS.json") --output ISLEPROGRESS-agg.json
+        reccmp-aggregate --samples $(find build-entropy -type f -name "LEGO1PROGRESS.json") --output LEGO1PROGRESS-agg.json
+
+    - name: Compare Aggregate Accuracy With Current Master
+      shell: bash
+      env:
+        RELEASE_URL: https://github.com/isledecomp/isle/releases/download/continuous
+      run: |
+        # Download the current master state
+        curl -fLSs -o CONFIGPROGRESS-agg-old.json $RELEASE_URL/CONFIGPROGRESS-agg.json || echo "" >CONFIGPROGRESS-agg-old.json
+        curl -fLSs -o ISLEPROGRESS-agg-old.json $RELEASE_URL/ISLEPROGRESS-agg.json || echo "" >ISLEPROGRESS-agg-old.json
+        curl -fLSs -o LEGO1PROGRESS-agg-old.json $RELEASE_URL/LEGO1PROGRESS-agg.json || echo "" >LEGO1PROGRESS-agg-old.json
+        
+        # Compare with current master
+        reccmp-aggregate --diff CONFIGPROGRESS-agg-old.json CONFIGPROGRESS-agg.json || echo "Current master not found"
+        reccmp-aggregate --diff ISLEPROGRESS-agg-old.json ISLEPROGRESS-agg.json || echo "Current master not found"
+        reccmp-aggregate --diff LEGO1PROGRESS-agg-old.json LEGO1PROGRESS-agg.json || echo "Current master not found"
+
    - name: Test Exports
      shell: bash
      run: |
@@ -180,9 +306,9 @@ jobs:
      with:
        name: Accuracy Report
        path: |
-          CONFIGPROGRESS.*
-          ISLEPROGRESS.*
-          LEGO1PROGRESS.*
+          CONFIGPROGRESS*
+          ISLEPROGRESS*
+          LEGO1PROGRESS*

  upload:
    name: Upload artifacts
@@ -212,9 +338,9 @@ jobs:
          build/CONFIG.EXE \
          build/ISLE.EXE \
          build/LEGO1.DLL \
-          CONFIGPROGRESS.* \
-          ISLEPROGRESS.* \
-          LEGO1PROGRESS.*
+          CONFIGPROGRESS* \
+          ISLEPROGRESS* \
+          LEGO1PROGRESS*

        curl -X POST -F key=$UPLOAD_KEY -F 'file=@CONFIGPROGRESS.SVG' https://legoisland.org/progress/
        curl -X POST -F key=$UPLOAD_KEY -F 'file=@ISLEPROGRESS.SVG' https://legoisland.org/progress/