wip: fix installation of FPC + use pre-compiled GLUT DLLs

striezel · Jan 24, 2024 · 042892e · 042892e
1 parent a05bae8
commit 042892e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -17,18 +17,18 @@ jobs:
       - name: Download FreePascal Compiler
         shell: bash
         run: |
-          curl -L --output fpc-3.2.2.i386-win32.cross.x86_64-win64.exe https://sourceforge.net/projects/freepascal/files/Win32/3.2.2/fpc-3.2.2.i386-win32.cross.x86_64-win64.exe
+          curl -L --output fpc-3.2.2.win32.and.win64.exe https://sourceforge.net/projects/freepascal/files/Win32/3.2.2/fpc-3.2.2.win32.and.win64.exe
           CHECKSUM=$(sha256sum fpc-3.2.2.i386-win32.cross.x86_64-win64.exe)
           echo Checksum calculation: $CHECKSUM
           CHECKSUM_BITS=$(echo $CHECKSUM | cut -f 1 -d' ')
-          if [[ "$CHECKSUM_BITS" != "9b4ea18d9c0a613fcc815b78612967a62d539e8c42070299c5c3c2ce8f712768" ]]
+          if [[ "$CHECKSUM_BITS" != "8c255390544b051388b577eb61c6191a04883264afe0e3369b3600a56daf7bde" ]]
           then
             echo "Checksum of downloaded installer is wrong."
             exit 1
           fi
       - name: Install FreePascal Compiler
         shell: cmd
-        run: fpc-3.2.2.i386-win32.cross.x86_64-win64.exe /verysilent /norestart
+        run: fpc-3.2.2.win32.and.win64.exe /verysilent /norestart /LoadInf="ci\fpc_setup.inf"
       - name: Inspect files
         shell: cmd
         run: |
@@ -49,6 +49,19 @@ jobs:
           cd $GITHUB_WORKSPACE
           cd engine
           "/c/FPC/3.2.2/bin/i386-win32/fpc.exe" -S2 vespucci.dpr
+      - name: Download pre-compiled GLUT DLLs for Windows
+        shell: bash
+        run: |
+          curl -L --output glutdlls37beta.zip https://www.opengl.org/resources/libraries/glut/glutdlls37beta.zip
+          CHECKSUM=$(sha256sum glutdlls37beta.zip)
+          echo Checksum calculation: $CHECKSUM
+          CHECKSUM_BITS=$(echo $CHECKSUM | cut -f 1 -d' ')
+          if [[ "$CHECKSUM_BITS" != "26a78bae5626bae28c278335b22d524353427e7c374face2d147085b3ade85d3" ]]
+          then
+            echo "Checksum of downloaded GLUT binaries is wrong."
+            exit 1
+          fi
+          unzip glutdlls37beta.zip
       - name: Collect build artifacts
         shell: bash
         run: |
@@ -59,6 +72,8 @@ jobs:
           cp LICENSE artifacts/
           cp readme.md artifacts/
           cp known_bugs.md artifacts/
+          cp glut32.dll artifacts/
+          cp glut.dll artifacts/
       - name: Archive build artifacts
         uses: actions/upload-artifact@v4
         with:

diff --git a/ci/fpc_setup.inf b/ci/fpc_setup.inf
@@ -0,0 +1,4 @@
+[Setup]
+Lang=default
+SetupType=full
+Components=base,binutils,docs,ide,utils,make,demo,gdb,units,examples
diff --git a/ci/readme.md b/ci/readme.md
@@ -0,0 +1,7 @@
+# Files for use in CI pipelines
+
+This directory contains files which are used by the automated CI build workflows
+on GitHub or GitLab.
+
+* __fpc_setup.inf__: settings for use during silent installation of the Free
+  Pascal Compiler