Browse Source

Refactor GitHub Actions workflow for builds

Ugochukwu Mmaduekwe 23 hours ago
parent
commit
96f6a6d120
1 changed files with 39 additions and 35 deletions
  1. 39 35
      .github/workflows/make.yml

+ 39 - 35
.github/workflows/make.yml

@@ -1,9 +1,8 @@
----
 name: Make
 
 on:
   schedule:
-    - cron:  '0 0 1 * *'
+    - cron: '0 0 1 * *'
   push:
     branches:
       - "**"
@@ -27,36 +26,41 @@ jobs:
           - windows-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-
-    - name: Build on Linux
-      if: runner.os == 'Linux'
-      shell: bash
-      run: |
-        set -xeuo pipefail
-        sudo bash -c 'apt-get update; apt-get install -y lazarus' >/dev/null
-        instantfpc -Fu/usr/lib/lazarus/*/components/lazutils \
-          -B '.github/workflows/make.pas'
-
-    - name: Build on Windows
-      if: runner.os == 'Windows'
-      shell: powershell
-      run: |
-        $ErrorActionPreference = 'stop'
-        Set-PSDebug -Strict
-        New-Variable -Option Constant -Name VAR -Value @{
-          Uri =
-            'https://fossies.org/windows/misc/lazarus-3.8-fpc-3.2.2-win64.exe'
-          OutFile = (New-TemporaryFile).FullName + '.exe'
-        }
-        Invoke-WebRequest @VAR
-        & $VAR.OutFile.Replace('Temp', 'Temp\.') /SP- /VERYSILENT /NORESTART `
-          /SUPPRESSMSGBOXES | Out-Null
-        $Env:PATH+=';C:\Lazarus'
-        $Env:PATH+=';C:\Lazarus\fpc\3.2.2\bin\x86_64-win64'
-        'lazbuild', 'instantfpc' | % { (Get-Command $_).Source } | Out-Host
-        instantfpc -FuC:\Lazarus\components\lazutils `
-          -B '.github/workflows/make.pas'
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Build on Linux
+        if: runner.os == 'Linux'
+        shell: bash
+        run: |
+          set -xeuo pipefail
+          sudo bash -c 'apt-get update; apt-get install -y lazarus' >/dev/null
+          instantfpc -Fu/usr/lib/lazarus/*/components/lazutils .github/workflows/make.pas
+
+      - name: Build on Windows
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: |
+          $ErrorActionPreference = 'stop'
+          Set-PSDebug -Strict
+
+          Write-Host "Installing Lazarus and OpenSSL 1.1 via Chocolatey..."
+          choco upgrade chocolatey -y
+          choco install lazarus -y
+          choco install openssl.light --version=1.1.1.20181020 -y
+
+          Write-Host "Verifying installed packages..."
+          choco list
+
+          # Lazarus installs to C:\Lazarus by default
+          # Add Lazarus and OpenSSL paths for instantfpc
+          $env:Path += ';C:\Lazarus;C:\Lazarus\fpc\3.2.2\bin\x86_64-win64;C:\ProgramData\chocolatey\lib\openssl.light\tools'
+
+          Write-Host "Checking lazbuild and instantfpc availability..."
+          Get-Command lazbuild
+          Get-Command instantfpc
+
+          Write-Host "Building make.pas..."
+          instantfpc '-FuC:\Lazarus\components\lazutils' .github/workflows/make.pas