Merge pull request #2379 from DuendeSoftware/dh/allow-additional-prerelease-labels

Allow alpha and beta pre-release labels in release workflow version validation

Author: damianh

.github/workflow-gen/Program.cs

@@ -246,7 +246,7 @@ void GenerateReleaseWorkflow(Product product)
 
     job.Step()
         .Name("Validate Version Input")
-        .Run($@"echo '{contexts.Event.Input.Version}' | grep -P '^\d+\.\d+\.\d+(-preview\.\d+|-rc\.\d+)?$' || (echo 'Invalid version format' && exit 1)");
+        .Run($@"echo '{contexts.Event.Input.Version}' | grep -P '^\d+\.\d+\.\d+(-(?:alpha|beta|preview|rc)\.\d+)?$' || (echo 'Invalid version format' && exit 1)");
 
     job.StepGitCheckoutCustomBranch();
     job.StepGitConfig();

.github/workflow-gen/StepExtensions.cs

@@ -195,7 +195,7 @@ git push origin {component.TagPrefix}-{contexts.Event.Input.Version}
 
     public static WorkflowDispatch InputVersionBranchAndTagOverride(this WorkflowDispatch workflow) =>
         workflow.Inputs(
-            new StringInput("version", "Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N", true, "0.0.0"),
+            new StringInput("version", "Version in format X.Y.Z or X.Y.Z-{alpha,beta,preview,rc}.N", true, "0.0.0"),
             new StringInput("branch", "(Optional) the name of the branch to release from", false, "main"),
             new BooleanInput("remove-tag-if-exists", "If set, will remove the existing tag. Use this if you have issues with the previous release action", false, false));
 

.github/workflows/aspnetcore-authentication-jwtbearer-release.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N'
+        description: 'Version in format X.Y.Z or X.Y.Z-{alpha,beta,preview,rc}.N'
         type: string
         required: true
         default: '0.0.0'
@@ -39,7 +39,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Validate Version Input
-      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-preview\.\d+|-rc\.\d+)?$' || (echo 'Invalid version format' && exit 1)
+      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-(?:alpha|beta|preview|rc)\.\d+)?$' || (echo 'Invalid version format' && exit 1)
     - name: Checkout target branch
       if: github.event.inputs.branch != 'main'
       run: git checkout ${{ github.event.inputs.branch }}

.github/workflows/bff-release.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N'
+        description: 'Version in format X.Y.Z or X.Y.Z-{alpha,beta,preview,rc}.N'
         type: string
         required: true
         default: '0.0.0'
@@ -39,7 +39,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Validate Version Input
-      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-preview\.\d+|-rc\.\d+)?$' || (echo 'Invalid version format' && exit 1)
+      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-(?:alpha|beta|preview|rc)\.\d+)?$' || (echo 'Invalid version format' && exit 1)
     - name: Checkout target branch
       if: github.event.inputs.branch != 'main'
       run: git checkout ${{ github.event.inputs.branch }}

.github/workflows/conformance-report-release.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N'
+        description: 'Version in format X.Y.Z or X.Y.Z-{alpha,beta,preview,rc}.N'
         type: string
         required: true
         default: '0.0.0'
@@ -39,7 +39,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Validate Version Input
-      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-preview\.\d+|-rc\.\d+)?$' || (echo 'Invalid version format' && exit 1)
+      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-(?:alpha|beta|preview|rc)\.\d+)?$' || (echo 'Invalid version format' && exit 1)
     - name: Checkout target branch
       if: github.event.inputs.branch != 'main'
       run: git checkout ${{ github.event.inputs.branch }}

.github/workflows/docs-mcp-release.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N'
+        description: 'Version in format X.Y.Z or X.Y.Z-{alpha,beta,preview,rc}.N'
         type: string
         required: true
         default: '0.0.0'
@@ -39,7 +39,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Validate Version Input
-      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-preview\.\d+|-rc\.\d+)?$' || (echo 'Invalid version format' && exit 1)
+      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-(?:alpha|beta|preview|rc)\.\d+)?$' || (echo 'Invalid version format' && exit 1)
     - name: Checkout target branch
       if: github.event.inputs.branch != 'main'
       run: git checkout ${{ github.event.inputs.branch }}

.github/workflows/identity-server-release.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N'
+        description: 'Version in format X.Y.Z or X.Y.Z-{alpha,beta,preview,rc}.N'
         type: string
         required: true
         default: '0.0.0'
@@ -39,7 +39,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Validate Version Input
-      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-preview\.\d+|-rc\.\d+)?$' || (echo 'Invalid version format' && exit 1)
+      run: echo '${{ github.event.inputs.version }}' | grep -P '^\d+\.\d+\.\d+(-(?:alpha|beta|preview|rc)\.\d+)?$' || (echo 'Invalid version format' && exit 1)
     - name: Checkout target branch
       if: github.event.inputs.branch != 'main'
       run: git checkout ${{ github.event.inputs.branch }}

.github/workflows/templates-release.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version in format X.Y.Z, X.Y.Z-preview.N, or X.Y.Z-rc.N'
+        description: 'Version in format X.Y.Z or X.Y.Z-{alpha,beta,preview,rc}.N'
         type: string
         required: true
         default: '0.0.0'