Merge branch 'master' of https://github.com/hgy59/spksrc into add_7zip

SynoCommunity · Jan 2, 2025 · 4f78b4e · 4f78b4e
2 parents 6969245 + 5fe5ba6
commit 4f78b4e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -125,6 +125,7 @@ jobs:
     needs: prepare
     outputs:
       matrix: ${{ steps.defaults.outputs.matrix }}
+      has_entries: ${{ steps.defaults.outputs.has_entries }}
     steps:
       - id: defaults
         run: |
@@ -221,10 +222,14 @@ jobs:
           # Output the final matrix
           echo "matrix=$(echo $matrix | jq -c)" >> $GITHUB_OUTPUT
 
+          # Output if the matrix has entries
+          echo "has_entries=$(jq -e '.include | length > 0' <<< "$matrix" > /dev/null && echo true || echo false)" >> $GITHUB_OUTPUT
+
   build:
     name: Build
     needs: [prepare, set-defaults]
     runs-on: ubuntu-latest
+    if: ${{ needs.set-defaults.outputs.has_entries == 'true' }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJSON(needs.set-defaults.outputs.matrix) }}

diff --git a/native/dotnet-sdk-3.1/Makefile b/native/dotnet-sdk-3.1/Makefile
@@ -4,7 +4,7 @@ PKG_NAME = dotnet-sdk-3.1
 PKG_VERS = 3.1.410
 PKG_EXT = tar.gz
 PKG_DIST_NAME = dotnet-sdk-$(PKG_VERS)-linux-x64.$(PKG_EXT)
-PKG_DIST_SITE = https://dotnetcli.azureedge.net/dotnet/Sdk/${PKG_VERS}
+PKG_DIST_SITE = https://builds.dotnet.microsoft.com/dotnet/Sdk/${PKG_VERS}
 
 HOMEPAGE = https://dotnet.microsoft.com/
 COMMENT  = A developer platform for building apps.

diff --git a/native/dotnet-sdk-6.0/Makefile b/native/dotnet-sdk-6.0/Makefile
@@ -4,7 +4,7 @@ PKG_NAME = dotnet-sdk-6.0
 PKG_VERS = 6.0.428
 PKG_EXT = tar.gz
 PKG_DIST_NAME = dotnet-sdk-$(PKG_VERS)-linux-x64.$(PKG_EXT)
-PKG_DIST_SITE = https://dotnetcli.azureedge.net/dotnet/Sdk/${PKG_VERS}
+PKG_DIST_SITE = https://builds.dotnet.microsoft.com/dotnet/Sdk/${PKG_VERS}
 
 HOMEPAGE = https://dotnet.microsoft.com/
 COMMENT  = A developer platform for building apps.

diff --git a/native/dotnet-sdk-8.0/Makefile b/native/dotnet-sdk-8.0/Makefile
@@ -4,7 +4,7 @@ PKG_NAME = dotnet-sdk-8.0
 PKG_VERS = 8.0.404
 PKG_EXT = tar.gz
 PKG_DIST_NAME = dotnet-sdk-$(PKG_VERS)-linux-x64.$(PKG_EXT)
-PKG_DIST_SITE = https://dotnetcli.azureedge.net/dotnet/Sdk/${PKG_VERS}
+PKG_DIST_SITE = https://builds.dotnet.microsoft.com/dotnet/Sdk/${PKG_VERS}
 
 HOMEPAGE = https://dotnet.microsoft.com/
 COMMENT  = A developer platform for building apps.