Merge remote-tracking branch 'origin/main'

.github/workflows/generate-releases.yml

@@ -1,28 +0,0 @@
-name: generate-releases
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  generate:
-    permissions:
-      contents: write  # for stefanzweifel/git-auto-commit-action to push code in repo
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3
-        with:
-          token: ${{ secrets.GH_PAT }}
-      - uses: arduino/setup-task@e26d8975574116b0097a1161e0fe16ba75d84c1c # v1
-      - run: task docs:releases
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-      - uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5
-        with:
-          commit_message: "chore: docs releases json auto-update"
-          branch: main
-          commit_user_name: actions-user
-          commit_user_email: actions@github.com
-          commit_author: actions-user <actions@github.com>

.github/workflows/generate.yml

@@ -1,14 +1,7 @@
 name: generate
 
 on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - '.github/workflows/generate.yml'
-      - pkg/config/config.go
-      - CONTRIBUTING.md
-      - USERS.md
+  workflow_dispatch: {}
 
 permissions:
   contents: read
@@ -16,7 +9,7 @@ permissions:
 jobs:
   docs:
     permissions:
-      contents: write  # for stefanzweifel/git-auto-commit-action to push code in repo
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3
@@ -27,6 +20,7 @@ jobs:
           go-version: stable
           cache: true
       - uses: arduino/setup-task@e26d8975574116b0097a1161e0fe16ba75d84c1c # v1
+      - run: task docs:releases
       - run: task docs:generate
       - run: task schema:generate
       - uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5

.github/workflows/release.yml

@@ -3,9 +3,9 @@ name: release
 on:
   push:
     branches:
-      - 'main'
+      - "main"
     tags:
-      - 'v*'
+      - "v*"
 
 permissions:
   contents: write
@@ -15,7 +15,7 @@ permissions:
 jobs:
   trigger-generate:
     runs-on: ubuntu-latest
-    needs: [ goreleaser ]
+    needs: [goreleaser]
     steps:
       - uses: benc-uk/workflow-dispatch@v121
         if: startsWith(github.ref, 'refs/tags/v')
@@ -23,10 +23,10 @@ jobs:
           repo: goreleaser/goreleaser
           ref: main
           token: ${{ secrets.GH_PAT }}
-          workflow: generate-releases.yml
+          workflow: generate.yml
   notify-goreleaser-cross:
     runs-on: ubuntu-latest
-    needs: [ trigger-generate ]
+    needs: [trigger-generate]
     steps:
       - name: get version
         if: startsWith(github.ref, 'refs/tags/v')
@@ -43,11 +43,11 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_CLI_EXPERIMENTAL: "enabled"
-    needs: [ goreleaser ]
+    needs: [goreleaser]
     if: github.ref == 'refs/heads/main'
     strategy:
       matrix:
-        format: [ deb, rpm, apk ]
+        format: [deb, rpm, apk]
     steps:
       - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3
         with:

www/docs/static/schema-pro.json

@@ -769,9 +769,6 @@
 					},
 					"file_info": {
 						"$ref": "#/$defs/ContentFileInfo"
-					},
-					"expand": {
-						"type": "boolean"
 					}
 				},
 				"additionalProperties": false,
@@ -904,13 +901,7 @@
 						"type": "array"
 					},
 					"use": {
-						"type": "string",
-						"enum": [
-							"docker",
-							"buildx",
-							"podman"
-						],
-						"default": "docker"
+						"type": "string"
 					},
 					"templated_files": {
 						"items": {
@@ -2415,13 +2406,6 @@
 			},
 			"Project": {
 				"properties": {
-					"version": {
-						"type": "integer",
-						"enum": [
-							1
-						],
-						"default": 1
-					},
 					"project_name": {
 						"type": "string"
 					},
@@ -2676,10 +2660,7 @@
 					}
 				},
 				"additionalProperties": false,
-				"type": "object",
-				"required": [
-					"version"
-				]
+				"type": "object"
 			},
 			"ProjectMetadata": {
 				"properties": {

www/docs/static/schema.json

@@ -697,9 +697,6 @@
 					},
 					"file_info": {
 						"$ref": "#/$defs/ContentFileInfo"
-					},
-					"expand": {
-						"type": "boolean"
 					}
 				},
 				"additionalProperties": false,
@@ -822,12 +819,7 @@
 						"type": "array"
 					},
 					"use": {
-						"type": "string",
-						"enum": [
-							"docker",
-							"buildx"
-						],
-						"default": "docker"
+						"type": "string"
 					}
 				},
 				"additionalProperties": false,
@@ -2120,13 +2112,6 @@
 			},
 			"Project": {
 				"properties": {
-					"version": {
-						"type": "integer",
-						"enum": [
-							1
-						],
-						"default": 1
-					},
 					"project_name": {
 						"type": "string"
 					},
@@ -2348,10 +2333,7 @@
 					}
 				},
 				"additionalProperties": false,
-				"type": "object",
-				"required": [
-					"version"
-				]
+				"type": "object"
 			},
 			"ProjectMetadata": {
 				"properties": {