build with DSM 7.2

vegardit · Mar 28, 2024 · 5d96f1e · 5d96f1e
1 parent 5fa6348
commit 5d96f1e
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,24 +32,60 @@ on:
       DSM_VERSION:
         description: 'DSM Version'
         required: true
-        default: '7.1'
+        default: '7.2'
 
 defaults:
   run:
     shell: bash
 
 env:
-  DSM_VERSION: '7.1'
+  SYNO_TOOLKIT_BASE_URL: https://global.download.synology.com/download/ToolChain/toolkit
+  DSM_VERSION: '7.2'
 
 jobs:
+  ###########################################################
+  preparation:
+  ###########################################################
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v4  # https://github.com/actions/checkout
+
+    - name: Determine effective DSM version
+      run: |
+        set -eux
+        if [[ -n "${{ github.event.inputs.DSM_VERSION }}" ]]; then
+          echo "DSM_VERSION=${{ github.event.inputs.DSM_VERSION }}" >> $GITHUB_ENV
+        fi
+
+    - uses: actions/cache@v4  # https://github.com/actions/cache
+      id: cache_synology_toolkit_base_env
+      with:
+        path: toolkit_tarballs/base_env-*
+        key: synology_toolkit_tarballs_DSM${{ env.DSM_VERSION }}_base_env
+        lookup-only: true
+
+    - name: Download Synology Base Toolkit tarball
+      if: steps.cache_synology_toolkit_base_env.outputs.cache-hit != 'true'
+      run: |
+        set -eux
+
+        mkdir -p toolkit_tarballs
+        pushd toolkit_tarballs/
+          archive=base_env-${DSM_VERSION}.txz
+          curl -sSf "$SYNO_TOOLKIT_BASE_URL/$DSM_VERSION/base/$archive" -o $archive
+        popd
+
 
   ###########################################################
   build-spks:
   ###########################################################
     runs-on: ubuntu-latest
+    needs: 
+      - preparation
 
     strategy:
-      max-parallel: 4
       fail-fast: false
       matrix:
         # see https://kb.synology.com/en-uk/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have
@@ -62,7 +98,7 @@ jobs:
         - broadwell
         - broadwellnk
         - bromolow
-        - cedarview
+        #- cedarview  # no DSM 7.2 support
         - denverton  # e.g. RS2418+
         - geminilake
         - grantley
@@ -71,59 +107,60 @@ jobs:
         - purley
         - r1000
         - rtd1296
-        - rtd1619b
+        #- rtd1619b  # compat.h:41:2: error: #error "WireGuard has been merged into Linux >= 5.6 and therefore this compatibility module is no longer required."
         - v1000
 
     steps:
-    - name: Git checkout
-      uses: actions/checkout@v4  # https://github.com/actions/checkout
-
-    - name: Set effective DSM version
+    - name: Determine effective DSM version
       run: |
         set -eux
-
         if [[ -n "${{ github.event.inputs.DSM_VERSION }}" ]]; then
           echo "DSM_VERSION=${{ github.event.inputs.DSM_VERSION }}" >> $GITHUB_ENV
         fi
 
-    - name: Build synobuild Docker image
+
+    - name: "Show: environment variables"
+      run: env | sort
+
+
+    - name: Git checkout
+      uses: actions/checkout@v4  # https://github.com/actions/checkout
+
+
+    - name: Build [synobuild] Docker image
       run: |
         set -eux
 
         docker build -t synobuild .
 
-    - uses: actions/cache@v4  # https://github.com/actions/cache
+
+    - uses: actions/cache/restore@v4  # https://github.com/actions/cache
       with:
         path: toolkit_tarballs/base_env-*
         key: synology_toolkit_tarballs_DSM${{ env.DSM_VERSION }}_base_env
 
-    - uses: actions/cache@v4  # https://github.com/actions/cache
-      if: github.ref_name == 'master'
+
+    - uses: actions/cache/restore@v4  # https://github.com/actions/cache
       with:
         path: toolkit_tarballs/ds.*
         key: synology_toolkit_tarballs_DSM${{ env.DSM_VERSION }}_${{ matrix.PACKAGE_ARCH }}
 
+
     - name: Download Synology Toolkit tarballs
       run: |
         set -eux
 
         mkdir -p toolkit_tarballs
         pushd toolkit_tarballs/
-
-        archive_base_url="https://global.download.synology.com/download/ToolChain/toolkit/$DSM_VERSION"
-
-        archive=base_env-${DSM_VERSION}.txz
-        [[ -f $archive ]] || curl -sSf "$archive_base_url/base/$archive" -o $archive
-
-        archive=ds.${{ matrix.PACKAGE_ARCH }}-$DSM_VERSION.dev.txz
-        [[ -f $archive ]] || curl -sSf "$archive_base_url/${{ matrix.PACKAGE_ARCH }}/$archive" -o $archive
-
-        archive=ds.${{ matrix.PACKAGE_ARCH }}-$DSM_VERSION.env.txz
-        [[ -f $archive ]] || curl -sSf "$archive_base_url/${{ matrix.PACKAGE_ARCH }}/$archive" -o $archive
+          archive_base_url="https://global.download.synology.com/download/ToolChain/toolkit/$DSM_VERSION"
+          archive=ds.${{ matrix.PACKAGE_ARCH }}-$DSM_VERSION.dev.txz
+          [[ -f $archive ]] || curl -sSf "$SYNO_TOOLKIT_BASE_URL/$DSM_VERSION/${{ matrix.PACKAGE_ARCH }}/$archive" -o $archive
+          archive=ds.${{ matrix.PACKAGE_ARCH }}-$DSM_VERSION.env.txz
+          [[ -f $archive ]] || curl -sSf "$SYNO_TOOLKIT_BASE_URL/$DSM_VERSION/${{ matrix.PACKAGE_ARCH }}/$archive" -o $archive
         popd
 
+
     - name: Build SPK files
-      continue-on-error: true
       run: |
         set -eux
 
@@ -141,9 +178,10 @@ jobs:
           sudo mv "$spk" "${spk%.spk}_DSM${DSM_VERSION}.spk"
         done
 
+
     - name: Upload SPKs
-      if: github.ref == 'refs/heads/master'
-      uses: actions/upload-artifact@v4
+      if: github.ref_name == 'main'
+      uses: actions/upload-artifact@v4  # https://github.com/actions/upload-artifact
       with:
         name: artifacts-${{ matrix.PACKAGE_ARCH }}
         path: artifacts/**
@@ -155,17 +193,19 @@ jobs:
     runs-on: ubuntu-latest
     needs: 
       - build-spks
-    if: github.ref == 'refs/heads/master'
+    if: github.ref_name == 'main'
     concurrency: publish-latest-release # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idconcurrency
 
     steps:
     - name: Git checkout 
       # only required by "hub release create" to prevent "fatal: Not a git repository"
       uses: actions/checkout@v4  # https://github.com/actions/checkout
 
+
     - name: Download build artifacts
       uses: actions/download-artifact@v4
 
+
     - name: Set effective DSM version
       run: |
         set -eux
@@ -174,6 +214,7 @@ jobs:
           echo "DSM_VERSION=${{ github.event.inputs.DSM_VERSION }}" >> $GITHUB_ENV
         fi
 
+
     - name: Set effective WireGuard version
       run: |
         set -eux
@@ -182,6 +223,7 @@ jobs:
         [[ ${spks[0]} =~ ([0-9.]+) ]] && echo "${BASH_REMATCH[1]}"
         echo "WG_VERSION=${BASH_REMATCH[1]}" >> $GITHUB_ENV
 
+
     - name: "Delete previous release"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -198,10 +240,11 @@ jobs:
         # delete git tag
         tag_url="$api_base_url/git/refs/tags/${release_name}"
         if curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -fsLo /dev/null --head "$tag_url"; then
-           echo "Deleting tag [$tag_url]..."
-           curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -fsSL -X DELETE "$tag_url"
+          echo "Deleting tag [$tag_url]..."
+          curl -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" -fsSL -X DELETE "$tag_url"
         fi
 
+
     - name: "Create release"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -217,14 +260,15 @@ jobs:
         **Use at your own risk. We are not responsible if this breaks your NAS. Realistically it should not result in data loss, but it could render your NAS inaccessible if something goes wrong.**
 
         **Especially if you are not comfortable with removing the hard drives from your NAS and manually recovering the data, this is not for you.**
-        
+
         See https://kb.synology.com/en-uk/DSM/tutorial/What_kind_of_CPU_does_my_NAS_have to find the right architecture of your NAS
         " | GH_DEBUG=1 gh release create "$release_name" \
           --latest \
           --notes-file - \
           --target "${{ github.sha }}" \
           $(ls artifacts-*/WireGuard-*/*.spk)
 
+
     - name: "Delete intermediate build artifacts"
       uses: geekyeggo/delete-artifact@v5 # https://github.com/GeekyEggo/delete-artifact/
       with:

diff --git a/build.sh b/build.sh
@@ -84,6 +84,14 @@ if [ ! -d "$build_env" ]; then
         pkgscripts-ng/EnvDeploy -p $PACKAGE_ARCH -v $DSM_VER
     fi
 
+    # workaround for "error: unknown type name 'hsiphash_key_t'" on DSM 7.2, see also https://github.com/runfalk/synology-wireguard/issues/179
+    case $PACKAGE_ARCH in
+        avoton|armada38x|braswell|bromolow|grantley|monaco)
+            # remove the Synology siphash.h header file so WireGuard will be built using the 'built-in' compat siphash version wireguard compat sources
+            find "$build_env/usr/local" -type f -iwholename "**/DSM-$DSM_VER/build/include/linux/siphash.h" -exec rm -v {} \;
+        ;;
+    esac
+
     # Ensure the installed toolchain has support for CA signed certificates.
     # Without this wget on https:// will fail
     cp /etc/ssl/certs/ca-certificates.crt "$build_env/etc/ssl/certs/"

diff --git a/release.sh b/release.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSIONS=(6.2 7.0)
+VERSIONS=(6.2 7.0 7.1 7.2)
 ARCHS=(
     "apollolake"
     "armada38x"