Try building shipyard with shipyard

CorruptComputer · CorruptComputer · commit 2a87a0d7eaa5 · 2025-12-20T16:23:46.000-06:00
diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
@@ -13,6 +13,7 @@ runs:
       shell: bash
       run: |
         sudo apt-get install -y rpm
+        dotnet tool install --global shipyard
 
     - name: Print .NET version and SDKs
       shell: bash
diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
@@ -0,0 +1,33 @@
+name: .NET Build
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build & Test
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v6
+
+      - name: Setup Environment
+        uses: ./.github/actions/setup-env
+
+      - name: Build Packages
+        run: |
+          shipyard --config ./shipyard.json --output ./publish/
+
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: 'build.zip'
+          path: ./publish/*.rpm
diff --git a/Shipyard.Demo/shipyard.json b/Shipyard.Demo/shipyard.json
@@ -1,20 +1,19 @@
 {
-  "$schema": "../shipyard.schema.json",
+  "$schema": "https://raw.githubusercontent.com/CorruptComputer/Shipyard/refs/heads/develop/shipyard.schema.json",
   "projectFile": "./Shipyard.Demo.csproj",
   "framework": "net10.0",
   "runtimes": [
     "linux-x64"
   ],
   "version": "0.0.1",
-  "author": "My Company",
+  "author": "Nickolas Gupton",
   "license": "MIT",
   "repositoryUrl": "https://github.com/CorruptComputer/Shipyard",
   "formatConfigs": [
     {
       "format": "rpm",
       "packageName": "Shipyard.Demo",
       "release": 1,
-      "prefix": "/usr/local/bin/Shipyard.Demo",
       "provides": [],
       "dependsOn": [
         "dotnet-runtime-10.0"
diff --git a/Shipyard/Models/ProjectConfiguration/FormatConfiguration/RpmConfig.cs b/Shipyard/Models/ProjectConfiguration/FormatConfiguration/RpmConfig.cs
@@ -22,12 +22,6 @@ public record RpmConfig : FormatConfigurationBase
     [JsonPropertyName("release")]
     public int? Release { get; set; }
 
-    /// <summary>
-    ///   The installation prefix directory.
-    /// </summary>
-    [JsonPropertyName("prefix")]
-    public string? Prefix { get; set; }
-
     /// <summary>
     ///   The dependencies which this package provides.
     /// </summary>
@@ -56,11 +50,9 @@ public record RpmConfig : FormatConfigurationBase
     // Should NOT be used for full validation of config correctness
     [MemberNotNullWhen(true, nameof(PackageName))]
     [MemberNotNullWhen(true, nameof(Release))]
-    [MemberNotNullWhen(true, nameof(Prefix))]
     internal bool HasNonNullRequiredValues
         => !string.IsNullOrWhiteSpace(PackageName)
-            && Release.HasValue
-            && !string.IsNullOrWhiteSpace(Prefix);
+            && Release.HasValue;
 
     internal override bool Validate(TextWriter errorWriter)
     {
diff --git a/Shipyard/shipyard.json b/Shipyard/shipyard.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "https://raw.githubusercontent.com/CorruptComputer/Shipyard/refs/heads/develop/shipyard.schema.json",
+  "projectFile": "./Shipyard.csproj",
+  "framework": "net10.0",
+  "runtimes": [
+    "linux-x64"
+  ],
+  "version": "0.0.1",
+  "author": "Nickolas Gupton",
+  "license": "MIT",
+  "repositoryUrl": "https://github.com/CorruptComputer/Shipyard",
+  "formatConfigs": [
+    {
+      "format": "rpm",
+      "packageName": "Shipyard",
+      "release": 1,
+      "provides": [],
+      "dependsOn": [
+        "dotnet-runtime-10.0",
+        "dotnet-sdk-10.0",
+        "rpm-build"
+      ]
+    }
+  ]
+}
diff --git a/shipyard.schema.json b/shipyard.schema.json
@@ -93,8 +93,7 @@
       "required": [
         "format",
         "packageName",
-        "release",
-        "prefix"
+        "release"
       ],
       "additionalProperties": false,
       "properties": {
@@ -112,15 +111,6 @@
           "description": "Release number (incremented for rebuilds of the same version)",
           "minimum": 1
         },
-        "prefix": {
-          "type": "string",
-          "description": "Installation prefix directory",
-          "examples": [
-            "/opt/myapp",
-            "/usr/local",
-            "/usr"
-          ]
-        },
         "provides": {
           "type": "array",
           "description": "The dependencies which this package provides.",
