Update GitHub Actions runners and actions themselves (#89)

lighterowl · Jul 6, 2024 · b0bc890 · b0bc890
1 parent 409512f
commit b0bc890
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 18 deletions.
diff --git a/.github/build_macos.sh b/.github/build_macos.sh
@@ -38,16 +38,18 @@ fpc_lazarus_build_install() {
 
   mkdir -p "${fpc_installdir}"
 
-  make_opts_native=(
+  local -r make_opts_native=(
     COMPILER_LIBRARYDIR=${macosx_libdir}
     COMPILER_OPTIONS=-k-F${macosx_frameworkdir}
   )
   make "${make_opts_native[@]}" all
   make PREFIX=${fpc_installdir} install
 
-  make_opts_cross=("${make_opts_native[@]}" CPU_SOURCE=x86_64 CPU_TARGET=aarch64)
-  make "${make_opts_cross[@]}" all
-  make PREFIX=${fpc_installdir} "${make_opts_cross[@]}" crossinstall
+  if [[ $cross_build ]]; then
+    local -r make_opts_cross=("${make_opts_native[@]}" CPU_SOURCE=x86_64 CPU_TARGET=aarch64)
+    make "${make_opts_cross[@]}" all
+    make PREFIX=${fpc_installdir} "${make_opts_cross[@]}" crossinstall
+  fi
 
   export PATH=${fpc_installdir}/bin:${fpc_basepath}:$PATH
 

diff --git a/.github/build_windows.ps1 b/.github/build_windows.ps1
@@ -52,7 +52,7 @@ function FPC-Lazarus-Build-Install {
     make bigide
     $env:Path = "${lazarus};" + $env:Path
 
-    My-Download -Uri "https://slproweb.com/download/Win32OpenSSL_Light-3_1_5.exe" -OutFile openssl-install.exe
+    My-Download -Uri "https://slproweb.com/download/Win32OpenSSL_Light-3_1_6.exe" -OutFile openssl-install.exe
     Start-Process -FilePath openssl-install.exe -Wait -ArgumentList "/sp-","/verysilent","/suppressmsgboxes","/norestart","/dir=${openssl}"
 }
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -9,51 +9,86 @@ on:
 jobs:
   build-macos-arm64:
 
-    runs-on: [self-hosted, macOS, ARM64]
+    runs-on: macos-14
 
     steps:
     - uses: actions/checkout@v1
       with:
         submodules: recursive
 
+    - uses: actions/cache@v4
+      with:
+        path: |
+          ~/.transgui_sdk/lazarus
+          ~/.transgui_sdk/fpc-3.2.3
+        key: macos-arm64-fpc-lazarus
+
     - run: .github/build_macos.sh
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: TransGUI macOS arm64
         path: transgui_ppca64
+        if-no-files-found: error
 
   build-macos-x64:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v1
       with:
         submodules: recursive
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.transgui_sdk/lazarus
           ~/.transgui_sdk/fpc-3.2.3
-        key: macos-fpc-lazarus
+        key: macos-x64-fpc-lazarus
 
     - run: .github/build_macos.sh
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/upload-artifact@v4
+      with:
+        name: TransGUI macOS x64
+        path: transgui_ppcx64
+        if-no-files-found: error
+
+  package-macos:
+
+    needs: [build-macos-arm64, build-macos-x64]
+    runs-on: macos-12
+
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+
+    # no cache needed here as we don't compile anything
+    - uses: actions/download-artifact@v4
       with:
         name: TransGUI macOS arm64
         path: transgui_ppca64
 
+    - uses: actions/download-artifact@v4
+      with:
+        name: TransGUI macOS x64
+        path: transgui_ppcx64
+
     - run: .github/package_macos.sh
 
-# keeping this around would just be confusing
-    - uses: geekyeggo/delete-artifact@v2
+# keeping these around would just be confusing
+    - uses: geekyeggo/delete-artifact@v5
       with:
         name: TransGUI macOS arm64
 
-    - uses: actions/upload-artifact@v3
+    - uses: geekyeggo/delete-artifact@v5
+      with:
+        name: TransGUI macOS x64
+
+    - uses: actions/upload-artifact@v4
       with:
         name: TransGUI macOS Universal Binary
         path: Release/transgui.dmg
+        if-no-files-found: error
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -16,7 +16,7 @@ jobs:
       with:
         submodules: recursive
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.transgui_sdk/lazarus
@@ -25,7 +25,8 @@ jobs:
 
     - run: .github/build_ubuntu.sh
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: TransGUI Linux
         path: units/transgui-x86_64.AppImage
+        if-no-files-found: error
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -16,7 +16,7 @@ jobs:
       with:
         submodules: recursive
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~\transgui_sdk\fpc-3.2.3
@@ -28,7 +28,8 @@ jobs:
     - shell: pwsh
       run: .github/build_windows.ps1
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: TransGUI Windows
         path: Release\transgui.7z
+        if-no-files-found: error