Merge pull request #1176 from b-editor/feat/release-workflow

Add standalone binary creation to release workflow
b-editor · Nov 28, 2024 · 458c0d4 · 458c0d4
2 parents 97aab46 + 1e1fd3d
commit 458c0d4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 23 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,6 +31,7 @@ jobs:
     strategy:
       matrix:
         rid: [ linux_x64, win_x64, osx_x64, osx_arm64 ]
+        standalone: [ true, false ]
 
     steps:
       - name: Checkout
@@ -49,6 +50,7 @@ jobs:
       - name: Publish
         run: |
           ./build.sh publish \
+            --self-contained ${{ matrix.standalone }} \
             --runtime ${{ matrix.rid }} \
             --skip restore \
             --version ${{ needs.determine-version.outputs.nugetVer }} \
@@ -83,17 +85,24 @@ jobs:
           gh api -H "Accept: application/octet-stream" -H "X-GitHub-Api-Version: 2022-11-28" /repos/yuto-trd/opencvsharp-extern-builds/releases/assets/$ASSET_ID > libOpenCvSharpExtern.so
 
       - name: Zip
-        run: ./build.sh zip --runtime ${{ matrix.rid }} --skip publish --version ${{ needs.determine-version.outputs.nugetVer }}
+        run: ./build.sh zip \
+            --runtime ${{ matrix.rid }} \
+            --self-contained ${{ matrix.standalone }} \
+            --skip publish \
+            --version ${{ needs.determine-version.outputs.nugetVer }}
 
       - name: Save
         uses: actions/upload-artifact@v4
         with:
-          name: beutl-${{ matrix.rid }}-${{ needs.determine-version.outputs.semVer }}
+          name: beutl-${{ matrix.rid }}${{ matrix.standalone == 'true' && '-standalone' || '' }}-${{ needs.determine-version.outputs.semVer }}
           path: ./artifacts/*.zip
 
   build-windows-installer:
     needs: [ determine-version, build-executable ]
     runs-on: windows-latest
+    strategy:
+      matrix:
+        standalone: [ true, false ]
 
     steps:
       - name: Checkout
@@ -106,23 +115,26 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: beutl-win_x64-${{ needs.determine-version.outputs.semVer }}
+          name: beutl-win_x64-standalone-${{ needs.determine-version.outputs.semVer }}
           path: artifacts
 
       - name: Extract zip
         run: |
           mkdir output/Beutl
           cd output/Beutl
-          7z x ../../artifacts/beutl-win-x64-${{ needs.determine-version.outputs.semVer }}.zip
+          7z x ../../artifacts/beutl-win-x64-standalone-${{ needs.determine-version.outputs.semVer }}.zip
 
       - name: Build installer
-        run: ./build.cmd build-installer --skip publish --assembly-version ${{ needs.determine-version.outputs.asmVer }}
+        run: ./build.cmd build-installer \
+            --skip publish \
+            --self-contained true \
+            --assembly-version ${{ needs.determine-version.outputs.asmVer }}
 
       - name: Save installer
         uses: actions/upload-artifact@v4
         with:
-          name: beutl-setup
-          path: ./artifacts/beutl-setup.exe
+          name: beutl${{ matrix.standalone == 'true' && '-standalone' || '' }}-setup
+          path: ./artifacts/beutl${{ matrix.standalone == 'true' && '-standalone' || '' }}-setup.exe
 
   build-debian-package:
     needs: [ determine-version, build-executable ]
@@ -273,7 +285,7 @@ jobs:
       - uses: ncipollo/release-action@v1
         id: create_release
         with:
-          artifacts: "artifacts/**/*.zip,artifacts/**/*.nupkg,artifacts/**/*.deb,artifacts/beutl-setup/beutl-setup.exe"
+          artifacts: "artifacts/**/*.zip,artifacts/**/*.deb,artifacts/beutl-setup/beutl-setup.exe,artifacts/beutl-standalone-setup/beutl-standalone-setup.exe"
           draft: true
           makeLatest: true
           generateReleaseNotes: true
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
@@ -10,26 +10,19 @@ class Build : NukeBuild
     ///   - JetBrains Rider            https://nuke.build/rider
     ///   - Microsoft VisualStudio     https://nuke.build/visualstudio
     ///   - Microsoft VSCode           https://nuke.build/vscode
-
     public static int Main() => Execute<Build>(x => x.Compile);
 
-    [Parameter]
-    Configuration Configuration = Configuration.Release;
+    [Parameter] Configuration Configuration = Configuration.Release;
 
-    [Parameter]
-    RuntimeIdentifier Runtime = null;
+    [Parameter] RuntimeIdentifier Runtime = null;
 
-    [Parameter]
-    bool SelfContained = false;
+    [Parameter] bool SelfContained = false;
 
-    [Parameter]
-    string Version = "1.0.0";
+    [Parameter] string Version = "1.0.0";
 
-    [Parameter]
-    string AssemblyVersion = "1.0.0.0";
+    [Parameter] string AssemblyVersion = "1.0.0.0";
 
-    [Parameter]
-    string InformationalVersion = "1.0.0.0";
+    [Parameter] string InformationalVersion = "1.0.0.0";
 
     [Solution] readonly Solution Solution;
     [GitRepository] readonly GitRepository GitRepository;
@@ -155,9 +148,10 @@ private string GetTFM()
                 fileName.Append('-');
                 fileName.Append(Runtime.ToString());
             }
+
             if (SelfContained && Runtime != null)
             {
-                fileName.Append("-sc");
+                fileName.Append("-standalone");
             }
 
             fileName.Append('-');
@@ -177,6 +171,7 @@ private string GetTFM()
                 .SetKeyValueDefinition("MyLicenseFile", RootDirectory / "LICENSE")
                 .SetKeyValueDefinition("MySetupIconFile", RootDirectory / "assets/logos/logo.ico")
                 .SetKeyValueDefinition("MySource", OutputDirectory / "Beutl")
+                .SetKeyValueDefinition("MyOutputBaseFilename", $"beutl{(SelfContained ? "-standalone" : "")}-setup")
                 .SetScriptFile(RootDirectory / "nukebuild/beutl-setup.iss"));
         });
 

diff --git a/nukebuild/beutl-setup.iss b/nukebuild/beutl-setup.iss
@@ -13,6 +13,7 @@
 #define MyAppAssocName MyAppName + " Project File"
 #define MyAppAssocExt ".bep"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+; #define MyOutputBaseFilename "beutl-setup"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@@ -33,7 +34,7 @@ LicenseFile={#MyLicenseFile}
 ;PrivilegesRequired=lowest
 PrivilegesRequiredOverridesAllowed=dialog
 OutputDir={#MyOutputDir}
-OutputBaseFilename=beutl-setup
+OutputBaseFilename={#MyOutputBaseFilename}
 SetupIconFile={#MySetupIconFile}
 Compression=lzma
 SolidCompression=yes