feat: refactor CI/CD workflows

GerryFerdinandus · GerryFerdinandus · commit 982629eef9de · 2025-12-27T17:07:35.000+01:00
To use the  composite action to install Lazarus
diff --git a/.github/workflows/cicd_macos.yaml b/.github/workflows/cicd_macos.yaml
@@ -37,169 +37,75 @@ env:
   BUILD_WITH_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
   PROJECT_LPI: source/project/tracker_editor/trackereditor.lpi
   RELEASE_DMG_FILE: trackereditor_macOS_notarized_universal_binary.dmg
-  # Copied the latest Lazarus source code from: https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/
-  LAZARUS_URL_TAR_GZ: "https://github.com/GerryFerdinandus/bittorrent-tracker-editor/releases/download/V1.32.0/lazarus.tar.gz"
 
 jobs:
-  build_aarch64: # Build for Apple silicon Mac architecture
-    runs-on: macos-latest
+  build:
     timeout-minutes: 60
+
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations.
+      fail-fast: false
+
+      # Set up an include to perform the following build configurations.
+      matrix:
+        include:
+          - BUILD_TARGET: build_aarch64
+            ARCH: aarch64
+            RUNS_ON: macos-latest
+
+          - BUILD_TARGET: build_x86_64
+            ARCH: x86_64
+            RUNS_ON: macos-15-intel
+
+    name: ${{ matrix.BUILD_TARGET }}
+    runs-on: ${{ matrix.RUNS_ON }}
+
     steps:
     - uses: actions/checkout@v6
       with:
         submodules: true
 
-    - name: Install Free Pascal Compiler (FPC) multi arch version for macOS x86_64 and aarch64
-      run: brew install fpc
-      shell: bash
+    - name: Install Lazarus IDE
+      uses: ./.github/actions/install_lazarus
 
-    - name: Download Lazarus source code into temp folder
+    - name: Build trackereditor app for Apple (${{ matrix.ARCH }})
       run: |
-        #Download lazarus source code. Directory 'lazarus' will be created in the temp folder.
-        cd ${RUNNER_TEMP}
-        curl -L -O ${{ env.LAZARUS_URL_TAR_GZ }}
-        tar -xzf *.tar.gz
-      shell: bash
-
-    - name: Build lazbuild from Lazarus source code
-      run: |
-        # make lazbuild and put the link with extra parameter in the temp folder.
-        LAZARUS_DIR=${RUNNER_TEMP}/lazarus
-        cd "$LAZARUS_DIR"
-        make lazbuild
-        echo "$LAZARUS_DIR/lazbuild --primary-config-path=$LAZARUS_DIR --lazarusdir=$LAZARUS_DIR \$*" > ${RUNNER_TEMP}/lazbuild
-        chmod +x ${RUNNER_TEMP}/lazbuild
-        # Add lazbuild to the PATH variable. So it can be used in the next steps.
-        echo ${RUNNER_TEMP} >> $GITHUB_PATH
-      shell: bash
-
-    - name: Build trackereditor app for Apple silicon (aarch64)
-      run: |
-        lazbuild --build-all --build-mode=Release --widgetset=cocoa --cpu=aarch64 ${{ env.PROJECT_LPI }}
+        lazbuild --build-all --build-mode=Release --widgetset=cocoa --cpu=${{ matrix.ARCH }} ${{ env.PROJECT_LPI }}
       shell: bash
 
     - name: Test App SSL connection
       run: open "${{ env.PROGRAM_NAME_WITH_PATH }}" --args -TEST_SSL
       shell: bash
 
-    - name: Set correct version number in macOS .app bundle Info.plist from metainfo xml file
-      env:
-        METAINFO_FILE: metainfo/io.github.gerryferdinandus.bittorrent-tracker-editor.metainfo.xml
-      run: |
-       TRACKER_EDITOR_VERSION=$(xmllint --xpath "string(/component/releases/release[1]/@version)" $METAINFO_FILE)
-       echo Program version: $TRACKER_EDITOR_VERSION
-       plutil -replace CFBundleShortVersionString -string $TRACKER_EDITOR_VERSION ${{ env.MACOS_APP }}/Contents/Info.plist
-      shell: bash
-
-    - name: Create and set app icon in macOS .app bundle
-      env:
-        ICON_FILE: 'metainfo/io.github.gerryferdinandus.bittorrent-tracker-editor.png'
-      run: |
-
-        # ------ Create icon set and move it into the app
-        iconset_folder="temp_folder.iconset"
-        rm -rf "${iconset_folder}"
-        mkdir -p "${iconset_folder}"
-
-        for s in 16 32 128 256 512; do
-          d=$(($s*2))
-          sips -Z $s $ICON_FILE --out "${iconset_folder}/icon_${s}x$s.png"
-          sips -Z $d $ICON_FILE --out "${iconset_folder}/icon_${s}x$s@2x.png"
-        done
-
-        # create .icns icon file
-        iconutil -c icns "${iconset_folder}" -o "iconfile.icns"
-        rm -r "${iconset_folder}"
-
-        # move icon file to the app
-        mv -f "iconfile.icns"  "${{ env.MACOS_APP }}/Contents/Resources"
-
-        # add icon to plist xml file CFBundleIconFile = "iconfile"
-        plutil -insert CFBundleIconFile -string "iconfile" "${{ env.MACOS_APP }}/Contents/Info.plist"
-      shell: bash
-
     - name: Zip the macOS .app bundle for artifact upload
+      if: matrix.ARCH == 'aarch64'
       run: ditto -c -k enduser/trackereditor.app enduser/trackereditor_app.zip
       shell: bash
 
     - name: Rename built -aarch64 binary for artifact upload
       run: |
-        mv ${{ env.PROGRAM_NAME_WITH_PATH }} ${{ env.PROGRAM_NAME_WITH_PATH }}-aarch64
-        ditto -c -k ${{ env.PROGRAM_NAME_WITH_PATH }}-aarch64 ${{ env.PROGRAM_NAME_WITH_PATH }}-aarch64.zip
+        mv ${{ env.PROGRAM_NAME_WITH_PATH }} ${{ env.PROGRAM_NAME_WITH_PATH }}-${{ matrix.ARCH }}
+        ditto -c -k ${{ env.PROGRAM_NAME_WITH_PATH }}-${{ matrix.ARCH }} ${{ env.PROGRAM_NAME_WITH_PATH }}-${{ matrix.ARCH }}.zip
       shell: bash
 
     - name: Upload Artifact.
       uses: actions/upload-artifact@v6
       with:
-        name: artifact-aarch64
+        name: artifact-${{ matrix.ARCH }}
         # Include both the zipped universal app bundle and the aarch64 binary zip
         path: enduser/*.zip
         if-no-files-found: error
 
-  build_x86_64: # Build for Intel Mac architecture
-    runs-on: macos-15-intel
-    timeout-minutes: 60
-    steps:
-    - uses: actions/checkout@v6
-      with:
-        submodules: true
-
-    - name: Install Free Pascal Compiler (FPC) multi arch version for macOS x86_64 and aarch64
-      run: brew install fpc
-      shell: bash
-
-    - name: Download Lazarus source code into temp folder
-      run: |
-        #Download lazarus source code. Directory 'lazarus' will be created in the temp folder.
-        cd ${RUNNER_TEMP}
-        curl -L -O ${{ env.LAZARUS_URL_TAR_GZ }}
-        tar -xzf *.tar.gz
-      shell: bash
-
-    - name: Build lazbuild from Lazarus source code
-      run: |
-        # make lazbuild and put the link with extra parameter in the temp folder.
-        LAZARUS_DIR=${RUNNER_TEMP}/lazarus
-        cd "$LAZARUS_DIR"
-        make lazbuild
-        echo "$LAZARUS_DIR/lazbuild --primary-config-path=$LAZARUS_DIR --lazarusdir=$LAZARUS_DIR \$*" > ${RUNNER_TEMP}/lazbuild
-        chmod +x ${RUNNER_TEMP}/lazbuild
-        # Add lazbuild to the PATH variable. So it can be used in the next steps.
-        echo ${RUNNER_TEMP} >> $GITHUB_PATH
-      shell: bash
-
-    - name: Build trackereditor app for Intel Mac version (x86_64)
-      run: |
-        lazbuild --build-all --build-mode=Release --widgetset=cocoa --cpu=x86_64 ${{ env.PROJECT_LPI }}
-      shell: bash
-
-    - name: Test App SSL connection
-      run: open "${{ env.PROGRAM_NAME_WITH_PATH }}" --args -TEST_SSL
-      shell: bash
-
-    - name: Rename built -x86_64 binary for artifact upload
-      run: |
-        mv ${{ env.PROGRAM_NAME_WITH_PATH }} ${{ env.PROGRAM_NAME_WITH_PATH }}-x86_64
-        ditto -c -k ${{ env.PROGRAM_NAME_WITH_PATH }}-x86_64 ${{ env.PROGRAM_NAME_WITH_PATH }}-x86_64.zip
-      shell: bash
-
-    - name: Upload Artifact.
-      uses: actions/upload-artifact@v6
-      with:
-        name: artifact-x86_64
-        path: enduser/*.zip
-        if-no-files-found: error
-
-
   create_universal_macOS_binary: # Create Universal binary from aarch64 and x86_64 builds
+    needs: build
     runs-on: macos-latest
     timeout-minutes: 60
 
-    needs:
-      - build_aarch64
-      - build_x86_64
-
     steps:
+    - uses: actions/checkout@v6
+      with:
+        sparse-checkout: metainfo
+
     - name: Install create-dmg tool
       run: brew install create-dmg
       shell: bash
@@ -227,6 +133,42 @@ jobs:
       run: ls -R enduser/
       shell: bash
 
+    - name: Set correct version number in macOS .app bundle Info.plist from metainfo xml file
+      env:
+        METAINFO_FILE: metainfo/io.github.gerryferdinandus.bittorrent-tracker-editor.metainfo.xml
+      run: |
+       TRACKER_EDITOR_VERSION=$(xmllint --xpath "string(/component/releases/release[1]/@version)" $METAINFO_FILE)
+       echo Program version: $TRACKER_EDITOR_VERSION
+       plutil -replace CFBundleShortVersionString -string $TRACKER_EDITOR_VERSION ${{ env.MACOS_APP }}/Contents/Info.plist
+      shell: bash
+
+    - name: Create and set app icon in macOS .app bundle
+      env:
+        ICON_FILE: 'metainfo/io.github.gerryferdinandus.bittorrent-tracker-editor.png'
+      run: |
+
+        # ------ Create icon set and move it into the app
+        iconset_folder="temp_folder.iconset"
+        rm -rf "${iconset_folder}"
+        mkdir -p "${iconset_folder}"
+
+        for s in 16 32 128 256 512; do
+          d=$(($s*2))
+          sips -Z $s $ICON_FILE --out "${iconset_folder}/icon_${s}x$s.png"
+          sips -Z $d $ICON_FILE --out "${iconset_folder}/icon_${s}x$s@2x.png"
+        done
+
+        # create .icns icon file
+        iconutil -c icns "${iconset_folder}" -o "iconfile.icns"
+        rm -r "${iconset_folder}"
+
+        # move icon file to the app
+        mv -f "iconfile.icns"  "${{ env.MACOS_APP }}/Contents/Resources"
+
+        # add icon to plist xml file CFBundleIconFile = "iconfile"
+        plutil -insert CFBundleIconFile -string "iconfile" "${{ env.MACOS_APP }}/Contents/Info.plist"
+      shell: bash
+
     - name: Create a Universal macOS binary from aarch64 and x86_64
       run: |
         # Create Universal binary using lipo tool
diff --git a/.github/workflows/cicd_ubuntu.yaml b/.github/workflows/cicd_ubuntu.yaml
@@ -15,9 +15,6 @@ jobs:
   build:
     timeout-minutes: 60
 
-    env: # Use the latest Lazarus source code. Copied from: https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/
-      LAZARUS_URL_TAR_GZ: "https://github.com/GerryFerdinandus/bittorrent-tracker-editor/releases/download/V1.32.0/lazarus.tar.gz"
-
     strategy:
       # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations.
       fail-fast: false
@@ -64,25 +61,15 @@ jobs:
       with:
         submodules: true
 
+    - name: Install Lazarus IDE
+      uses: ./.github/actions/install_lazarus
+      with:
+        qt_version_ci: ${{ matrix.QT_VERSION_CI }}
+
     - name: Install dependency for all build
       run: |
         sudo apt-get update
-        sudo apt-get install -y fpc xvfb
-      shell: bash
-
-    - name: Install dependency for gtk2
-      if: matrix.QT_VERSION_CI == ''
-      run: sudo apt-get install -y libgtk2.0-dev
-      shell: bash
-
-    - name: Install dependency for qt5
-      if: matrix.QT_VERSION_CI == '5'
-      run: sudo apt-get install -y libqt5x11extras5-dev
-      shell: bash
-
-    - name: Install dependency for qt6
-      if: matrix.QT_VERSION_CI == '6'
-      run: sudo apt-get install -y qt6-base-dev
+        sudo apt-get install -y xvfb
       shell: bash
 
     - name: Install dependency for AppImage
@@ -97,35 +84,6 @@ jobs:
         chmod +x linuxdeploy-*.AppImage
       shell: bash
 
-    - name: Download Lazarus source code into temp folder
-      run: |
-        #Download lazarus source code. Directory 'lazarus' will be created in the temp folder.
-        cd ${RUNNER_TEMP}
-        curl -L -O ${{ env.LAZARUS_URL_TAR_GZ }}
-        tar -xzf *.tar.gz
-      shell: bash
-
-    - name: Build libQTpas.so
-      if: matrix.QT_VERSION_CI != ''
-      run: |
-        cd "${RUNNER_TEMP}/lazarus/lcl/interfaces/qt${{ matrix.QT_VERSION_CI }}/cbindings/"
-        /usr/lib/qt${{ matrix.QT_VERSION_CI }}/bin/qmake
-        make -j$(nproc)
-        sudo make install
-      shell: bash
-
-    - name: Build lazbuild from Lazarus source code
-      run: |
-        # make lazbuild and put the link with extra parameter in the temp folder.
-        LAZARUS_DIR=${RUNNER_TEMP}/lazarus
-        cd "$LAZARUS_DIR"
-        make lazbuild
-        echo "$LAZARUS_DIR/lazbuild --primary-config-path=$LAZARUS_DIR --lazarusdir=$LAZARUS_DIR \$*" > ${RUNNER_TEMP}/lazbuild
-        chmod +x ${RUNNER_TEMP}/lazbuild
-        # Add lazbuild to the PATH variable. So it can be used in the next steps.
-        echo ${RUNNER_TEMP} >> $GITHUB_PATH
-      shell: bash
-
     - name: Build trackereditor
       # Build trackereditor project (Release mode)
       run: lazbuild --build-all --build-mode=Release ${{ matrix.LAZ_OPT }} source/project/tracker_editor/trackereditor.lpi
diff --git a/.github/workflows/cicd_windows.yaml b/.github/workflows/cicd_windows.yaml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-2025
+    runs-on: windows-latest
     timeout-minutes: 60
     env:
       LAZBUILD_WITH_PATH: c:/lazarus/lazbuild
@@ -26,7 +26,7 @@ jobs:
         submodules: true
 
     - name: Install Lazarus IDE
-      run: winget install lazarus --disable-interactivity --accept-source-agreements --silent
+      uses: ./.github/actions/install_lazarus
 
     - name: Download OpenSSL *.dll
       run:  |
