feat: update release-please config, allow releases from main.yml

.github/workflows/main.yml

@@ -23,6 +23,7 @@ jobs:
         uses: googleapis/release-please-action@v4
     outputs:
       releases_created: ${{ steps.release.outputs.releases_created }}
+      pr: ${{ steps.release.outputs.pr }}
       tag_name: ${{ steps.release.outputs.tag_name }}
   test-api:
     defaults:
@@ -433,7 +434,7 @@ jobs:
           SOURCE_DIR: staging-release
           DEST_DIR: unraid-api
 
-  create-draft-release:
+  publish-production-release:
     # Only run if release-please created a release
     if: needs.release-please.outputs.releases_created == 'true'
     runs-on: ubuntu-latest
@@ -453,13 +454,43 @@ jobs:
           mv plugins/production/dynamix.unraid.net.plg release/
           mv archive/*.txz release/
 
-      - name: Upload Release Assets
+      - name: Update Plugin with Changelog
+        run: |
+          # Parse PR JSON to get body
+          pr_json='${{ needs.release-please.outputs.pr }}'
+          changelog=$(echo "$pr_json" | jq -r '.body')
+          echo "Changelog: $changelog"
+          escapedChangelog=$(sed -e 's/[&\\/]/\\&/g; s/$/\\/' -e '$s/\\$//' <<<"$changelog")
+          sed -i -z -E "s/<CHANGES>(.*)<\/CHANGES>/<CHANGES>\n${escapedChangelog}\n<\/CHANGES>/g" "release/dynamix.unraid.net.plg"
+          echo "CHANGELOG=${escapedChangelog}" >> $GITHUB_ENV
+
+      - name: Upload to Digital Ocean Spaces
+        uses: BetaHuhn/do-spaces-action@v2
+        with:
+          access_key: ${{ secrets.DO_ACCESS_KEY }}
+          secret_key: ${{ secrets.DO_SECRET_KEY }}
+          space_name: ${{ secrets.DO_SPACE_NAME }}
+          space_region: ${{ secrets.DO_SPACE_REGION }}
+          source: "release"
+          out_dir: unraid-api
+
+      - name: Upload to Cloudflare
+        uses: jakejarvis/s3-sync-action@v0.5.1
+        env:
+          AWS_S3_ENDPOINT: ${{ secrets.CF_ENDPOINT }}
+          AWS_S3_BUCKET: ${{ secrets.CF_BUCKET }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
+          AWS_REGION: 'auto'
+          SOURCE_DIR: "release"
+          DEST_DIR: unraid-api
+
+      - name: Upload Release Assets to Github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          release_name=$(gh release list --repo ${{ github.repository }} --json name,isDraft --jq '.[] | select(.isDraft == true) | .name' | head -n 1)
-          # For each file in release directory
           for file in release/*; do
-            echo "Uploading $file to release..."
-            gh release upload "${release_name}" "$file" --clobber
+            gh release upload "${{ needs.release-please.outputs.tag_name }}" "$file" --clobber
           done
+
+          gh release edit "${{ needs.release-please.outputs.tag_name }}" --body "$CHANGELOG"

.github/workflows/release-production.yml

@@ -1,11 +1,11 @@
-name: Publish Release to Digital Ocean
+name: Update Release Changelog
 
 on:
   release:
-    types: [published]
+    types: [edited]
 
 jobs:
-  publish-to-digital-ocean:
+  update-release-changelog:
     runs-on: ubuntu-latest
 
     steps:
@@ -18,13 +18,27 @@ jobs:
           target: "./"
           version: "latest"
 
+      - name: Verify Required Files Exist
+        run: |
+          if [ ! -f "dynamix.unraid.net.plg" ]; then
+            echo "Error: dynamix.unraid.net.plg not found"
+            exit 1
+          fi
+
+          # Check for at least one .txz file
+          if [ -z "$(find . -name '*.txz')" ]; then
+            echo "Error: No .txz files found"
+            exit 1
+          fi
+
       - uses: cardinalby/git-get-release-action@v1
         id: release-info
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           latest: true
           prerelease: false
+
       - name: Get Release Changelog
         run: |
           notes=$(cat << EOF

.release-please-manifest.json

@@ -1 +1 @@
-{"api":"4.1.2","web":"4.1.2","unraid-ui":"4.1.2","plugin":"4.1.2"}
+{".": "4.1.2"}

package.json

@@ -1,6 +1,7 @@
 {
-  "name": "unraid-monorepo",
+  "name": "unraid-api-monorepo",
   "private": true,
+  "version": "4.1.2",
   "scripts": {
     "build": "pnpm -r build",
     "dev": "pnpm -r dev",

release-please-config.json

@@ -1,27 +1,17 @@
 {
-    "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
-    "packages": {
-        "api": {
-            "package-name": "@unraid/api",
-            "release-type": "node"
-        },
-        "web": {
-            "package-name": "@unraid/web",
-            "release-type": "node",
-            "skip-github-release": true
-        },
-        "unraid-ui": {
-            "package-name": "@unraid/ui",
-            "release-type": "node",
-            "skip-github-release": true
-        },
-        "plugin": {
-            "package-name": "@unraid/connect-plugin",
-            "release-type": "node",
-            "skip-github-release": true
-        }
-    },
-    "separate-pull-requests": false,
-    "include-component-in-tag": false,
-    "draft": true
-}
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "packages": {
+    ".": {
+      "release-type": "node",
+      "extra-files": [
+        "api/package.json",
+        "plugin/package.json",
+        "unraid-ui/package.json",
+        "web/package.json"
+      ]
+    }
+  },
+  "always-update": true,
+  "include-component-in-tag": false,
+  "draft": false
+}