add tag override

Erwinvandervalk · Erwinvandervalk · commit 368f47d47cbe · 2025-02-18T11:04:33.000+01:00
diff --git a/.github/workflow-gen/Program.cs b/.github/workflow-gen/Program.cs
@@ -1,4 +1,4 @@
-﻿﻿// Copyright (c) Duende Software. All rights reserved.
+﻿// Copyright (c) Duende Software. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 using Logicality.GitHub.Actions.Workflow;
@@ -110,8 +110,9 @@ void GenerateReleaseWorkflow(Component component)
     workflow.On
         .WorkflowDispatch()
         .Inputs(
-            new StringInput("version", "Version in format X.Y.Z or X.Y.Z-preview.", true, "0.0.0")
-            , new StringInput("target-branch", "(Optional) the name of the branch to release from", false, "main"));
+            new StringInput("version", "Version in format X.Y.Z or X.Y.Z-preview.", 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));
 
     workflow.EnvDefaults();
 
@@ -132,11 +133,26 @@ void GenerateReleaseWorkflow(Component component)
 
     tagJob.StepSetupDotNet();
 
+
+    tagJob.Step()
+        .Name("Git Config")
+        .Run(@"git config --global user.email ""github-bot@duendesoftware.com""
+git config --global user.name ""Duende Software GitHub Bot""");
+
+    tagJob.Step()
+        .Name("Remove previous git tag")
+        .If("github.event.inputs['remove-tag-if-exists'] == 'true'")
+        .Run($@"if git rev-parse {component.TagPrefix}-{contexts.Event.Input.Version} >/dev/null 2>&1; then
+  git tag -d {component.TagPrefix}-{contexts.Event.Input.Version}
+  git push --delete origin {component.TagPrefix}-{contexts.Event.Input.Version}
+else
+  echo 'Tag {component.TagPrefix}-{contexts.Event.Input.Version} does not exist.'
+fi");
+
+
     tagJob.Step()
         .Name("Git tag")
-        .Run($@"git config --global user.email ""github-bot@duendesoftware.com""
-git config --global user.name ""Duende Software GitHub Bot""
-git tag -a {component.TagPrefix}-{contexts.Event.Input.Version} -m ""Release v{contexts.Event.Input.Version}""
+        .Run($@"git tag -a {component.TagPrefix}-{contexts.Event.Input.Version} -m ""Release v{contexts.Event.Input.Version}""
 git push origin {component.TagPrefix}-{contexts.Event.Input.Version}");
 
     foreach (var project in component.Projects)
@@ -146,20 +162,20 @@ git tag -a {component.TagPrefix}-{contexts.Event.Input.Version} -m ""Release v{c
 
     tagJob.StepToolRestore();
 
-    tagJob.StepSign(true);
-
-    tagJob.StepPush("MyGet", "https://www.myget.org/F/duende_identityserver/api/v2/package", "MYGET");
+    tagJob.StepSign(always: true);
 
-    tagJob.StepPush("GitHub", "https://nuget.pkg.github.com/DuendeSoftware/index.json", "GITHUB_TOKEN")
+    tagJob.StepPush("GitHub", "https://nuget.pkg.github.com/DuendeSoftware/index.json", "GITHUB_TOKEN", pushAlways: true)
         .Env(("GITHUB_TOKEN", contexts.Secrets.GitHubToken),
             ("NUGET_AUTH_TOKEN", contexts.Secrets.GitHubToken));
 
-    tagJob.StepUploadArtifacts(component.Name);
+    tagJob.StepUploadArtifacts(component.Name, uploadAlways: true);
 
     var publishJob = workflow.Job("publish")
         .Name("Publish to nuget.org")
         .RunsOn(GitHubHostedRunners.UbuntuLatest)
-        .Needs("tag");
+        .Needs("tag")
+        .Environment("nuget.org", "");
+        ;
 
     publishJob.Step()
         .Uses("actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16") // 4.1.8
@@ -172,7 +188,9 @@ git tag -a {component.TagPrefix}-{contexts.Event.Input.Version} -m ""Release v{c
         .Shell("bash")
         .Run("tree");
 
-    publishJob.StepPush("nuget.org", "https://api.nuget.org/v3/index.json", "NUGET_ORG_API_KEY");
+    tagJob.StepPush("MyGet", "https://www.myget.org/F/duende_identityserver/api/v2/package", "MYGET", pushAlways: true);
+
+    publishJob.StepPush("nuget.org", "https://api.nuget.org/v3/index.json", "NUGET_ORG_API_KEY", pushAlways: true);
 
     var fileName = $"{component.Name}-release";
     WriteWorkflow(workflow, fileName);
@@ -320,22 +338,31 @@ dotnet NuGetKeyVaultSignTool sign "$file" {flags}
     public static Step IfGithubEventIsPush(this Step step)
         => step.If("github.event_name == 'push'");
 
-    public static Step StepPush(this Job job, string destination, string sourceUrl, string secretName)
+    public static Step StepPush(this Job job, string destination, string sourceUrl, string secretName, bool pushAlways = false)
     {
         var apiKey = $"${{{{ secrets.{secretName} }}}}";
-        return job.Step()
-            .Name($"Push packages to {destination}")
-            .IfRefMain()
-            .Run($"dotnet nuget push artifacts/*.nupkg --source {sourceUrl} --api-key {apiKey} --skip-duplicate");
+        var step = job.Step()
+            .Name($"Push packages to {destination}");
+
+        if (!pushAlways)
+        {
+            step.IfRefMain();
+        }
+        return step.Run($"dotnet nuget push artifacts/*.nupkg --source {sourceUrl} --api-key {apiKey} --skip-duplicate");
     }
 
-    public static void StepUploadArtifacts(this Job job, string componentName)
+    public static void StepUploadArtifacts(this Job job, string componentName, bool uploadAlways = false)
     {
         var path = $"{componentName}/artifacts/*.nupkg";
-        job.Step()
-            .Name("Upload Artifacts")
-            .IfGithubEventIsPush()
-            .Uses("actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882") // 4.4.3
+        var step = job.Step()
+            .Name("Upload Artifacts");
+
+        if (!uploadAlways)
+        {
+            step.IfGithubEventIsPush();
+        }
+
+        step.Uses("actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882") // 4.4.3
             .With(
                 ("name", "artifacts"),
                 ("path", path),
diff --git a/.github/workflows/access-token-management-release.yml b/.github/workflows/access-token-management-release.yml
@@ -9,11 +9,16 @@ on:
         type: string
         required: true
         default: '0.0.0'
-      target-branch:
+      branch:
         description: '(Optional) the name of the branch to release from'
         type: string
         required: false
         default: 'main'
+      remove-tag-if-exists:
+        description: 'If set, will remove the existing tag. Use this if you have issues with the previous release action'
+        type: boolean
+        required: false
+        default: false
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -43,10 +48,21 @@ jobs:
           6.0.x
           8.0.x
           9.0.x
-    - name: Git tag
+    - name: Git Config
       run: |-
         git config --global user.email "github-bot@duendesoftware.com"
         git config --global user.name "Duende Software GitHub Bot"
+    - name: Remove previous git tag
+      if: github.event.inputs['remove-tag-if-exists'] == 'true'
+      run: |-
+        if git rev-parse atm-${{ github.event.inputs.version }} >/dev/null 2>&1; then
+          git tag -d atm-${{ github.event.inputs.version }}
+          git push --delete origin atm-${{ github.event.inputs.version }}
+        else
+          echo 'Tag atm-${{ github.event.inputs.version }} does not exist.'
+        fi
+    - name: Git tag
+      run: |-
         git tag -a atm-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
         git push origin atm-${{ github.event.inputs.version }}
     - name: Pack AccessTokenManagement
@@ -60,28 +76,27 @@ jobs:
         for file in artifacts/*.nupkg; do
            dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate NuGetPackageSigning
         done
-    - name: Push packages to MyGet
-      if: github.ref == 'refs/heads/main'
-      run: dotnet nuget push artifacts/*.nupkg --source https://www.myget.org/F/duende_identityserver/api/v2/package --api-key ${{ secrets.MYGET }} --skip-duplicate
     - name: Push packages to GitHub
-      if: github.ref == 'refs/heads/main'
       run: dotnet nuget push artifacts/*.nupkg --source https://nuget.pkg.github.com/DuendeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Upload Artifacts
-      if: github.event_name == 'push'
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
         name: artifacts
         path: access-token-management/artifacts/*.nupkg
         overwrite: true
         retention-days: 15
+    - name: Push packages to MyGet
+      run: dotnet nuget push artifacts/*.nupkg --source https://www.myget.org/F/duende_identityserver/api/v2/package --api-key ${{ secrets.MYGET }} --skip-duplicate
   publish:
     name: Publish to nuget.org
     needs:
     - tag
     runs-on: ubuntu-latest
+    environment:
+      name: nuget.org
     steps:
     - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
@@ -98,5 +113,4 @@ jobs:
       run: tree
       shell: bash
     - name: Push packages to nuget.org
-      if: github.ref == 'refs/heads/main'
       run: dotnet nuget push artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} --skip-duplicate
diff --git a/.github/workflows/identity-model-oidc-client-release.yml b/.github/workflows/identity-model-oidc-client-release.yml
@@ -9,11 +9,16 @@ on:
         type: string
         required: true
         default: '0.0.0'
-      target-branch:
+      branch:
         description: '(Optional) the name of the branch to release from'
         type: string
         required: false
         default: 'main'
+      remove-tag-if-exists:
+        description: 'If set, will remove the existing tag. Use this if you have issues with the previous release action'
+        type: boolean
+        required: false
+        default: false
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -43,10 +48,21 @@ jobs:
           6.0.x
           8.0.x
           9.0.x
-    - name: Git tag
+    - name: Git Config
       run: |-
         git config --global user.email "github-bot@duendesoftware.com"
         git config --global user.name "Duende Software GitHub Bot"
+    - name: Remove previous git tag
+      if: github.event.inputs['remove-tag-if-exists'] == 'true'
+      run: |-
+        if git rev-parse imoc-${{ github.event.inputs.version }} >/dev/null 2>&1; then
+          git tag -d imoc-${{ github.event.inputs.version }}
+          git push --delete origin imoc-${{ github.event.inputs.version }}
+        else
+          echo 'Tag imoc-${{ github.event.inputs.version }} does not exist.'
+        fi
+    - name: Git tag
+      run: |-
         git tag -a imoc-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
         git push origin imoc-${{ github.event.inputs.version }}
     - name: Pack IdentityModel.OidcClient
@@ -60,28 +76,27 @@ jobs:
         for file in artifacts/*.nupkg; do
            dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate NuGetPackageSigning
         done
-    - name: Push packages to MyGet
-      if: github.ref == 'refs/heads/main'
-      run: dotnet nuget push artifacts/*.nupkg --source https://www.myget.org/F/duende_identityserver/api/v2/package --api-key ${{ secrets.MYGET }} --skip-duplicate
     - name: Push packages to GitHub
-      if: github.ref == 'refs/heads/main'
       run: dotnet nuget push artifacts/*.nupkg --source https://nuget.pkg.github.com/DuendeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Upload Artifacts
-      if: github.event_name == 'push'
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
         name: artifacts
         path: identity-model-oidc-client/artifacts/*.nupkg
         overwrite: true
         retention-days: 15
+    - name: Push packages to MyGet
+      run: dotnet nuget push artifacts/*.nupkg --source https://www.myget.org/F/duende_identityserver/api/v2/package --api-key ${{ secrets.MYGET }} --skip-duplicate
   publish:
     name: Publish to nuget.org
     needs:
     - tag
     runs-on: ubuntu-latest
+    environment:
+      name: nuget.org
     steps:
     - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
@@ -98,5 +113,4 @@ jobs:
       run: tree
       shell: bash
     - name: Push packages to nuget.org
-      if: github.ref == 'refs/heads/main'
       run: dotnet nuget push artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} --skip-duplicate
diff --git a/.github/workflows/identity-model-release.yml b/.github/workflows/identity-model-release.yml
@@ -9,11 +9,16 @@ on:
         type: string
         required: true
         default: '0.0.0'
-      target-branch:
+      branch:
         description: '(Optional) the name of the branch to release from'
         type: string
         required: false
         default: 'main'
+      remove-tag-if-exists:
+        description: 'If set, will remove the existing tag. Use this if you have issues with the previous release action'
+        type: boolean
+        required: false
+        default: false
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -43,10 +48,21 @@ jobs:
           6.0.x
           8.0.x
           9.0.x
-    - name: Git tag
+    - name: Git Config
       run: |-
         git config --global user.email "github-bot@duendesoftware.com"
         git config --global user.name "Duende Software GitHub Bot"
+    - name: Remove previous git tag
+      if: github.event.inputs['remove-tag-if-exists'] == 'true'
+      run: |-
+        if git rev-parse im-${{ github.event.inputs.version }} >/dev/null 2>&1; then
+          git tag -d im-${{ github.event.inputs.version }}
+          git push --delete origin im-${{ github.event.inputs.version }}
+        else
+          echo 'Tag im-${{ github.event.inputs.version }} does not exist.'
+        fi
+    - name: Git tag
+      run: |-
         git tag -a im-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
         git push origin im-${{ github.event.inputs.version }}
     - name: Pack IdentityModel
@@ -58,28 +74,27 @@ jobs:
         for file in artifacts/*.nupkg; do
            dotnet NuGetKeyVaultSignTool sign "$file" --file-digest sha256 --timestamp-rfc3161 http://timestamp.digicert.com --azure-key-vault-url https://duendecodesigninghsm.vault.azure.net/ --azure-key-vault-client-id 18e3de68-2556-4345-8076-a46fad79e474 --azure-key-vault-tenant-id ed3089f0-5401-4758-90eb-066124e2d907 --azure-key-vault-client-secret ${{ secrets.SignClientSecret }} --azure-key-vault-certificate NuGetPackageSigning
         done
-    - name: Push packages to MyGet
-      if: github.ref == 'refs/heads/main'
-      run: dotnet nuget push artifacts/*.nupkg --source https://www.myget.org/F/duende_identityserver/api/v2/package --api-key ${{ secrets.MYGET }} --skip-duplicate
     - name: Push packages to GitHub
-      if: github.ref == 'refs/heads/main'
       run: dotnet nuget push artifacts/*.nupkg --source https://nuget.pkg.github.com/DuendeSoftware/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Upload Artifacts
-      if: github.event_name == 'push'
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
         name: artifacts
         path: identity-model/artifacts/*.nupkg
         overwrite: true
         retention-days: 15
+    - name: Push packages to MyGet
+      run: dotnet nuget push artifacts/*.nupkg --source https://www.myget.org/F/duende_identityserver/api/v2/package --api-key ${{ secrets.MYGET }} --skip-duplicate
   publish:
     name: Publish to nuget.org
     needs:
     - tag
     runs-on: ubuntu-latest
+    environment:
+      name: nuget.org
     steps:
     - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
@@ -96,5 +111,4 @@ jobs:
       run: tree
       shell: bash
     - name: Push packages to nuget.org
-      if: github.ref == 'refs/heads/main'
       run: dotnet nuget push artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_ORG_API_KEY }} --skip-duplicate
diff --git a/.github/workflows/ignore-this-release.yml b/.github/workflows/ignore-this-release.yml
