Merge pull request #2016 from microsoft/fix/ci-hidi-gh-upload

fix/ci hidi gh upload
microsoft · Dec 20, 2024 · c183323 · c183323
2 parents 80164af + f52cf96
commit c183323
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 63 deletions.
diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
@@ -213,41 +213,13 @@ extends:
               pool:
                 vmImage: ubuntu-latest
               steps:
-              - pwsh: |
-                  $artifactName = Get-ChildItem -Path $(Pipeline.Workspace)\Nugets -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
-                  $artifactVersion= $artifactName.Name -replace "Microsoft.OpenApi.", "" -replace ".nupkg", ""
-                  #Set Variable $artifactName and $artifactVersion
-                  Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false; isOutput=true]$artifactVersion"
-                  Write-Host "##vso[task.setvariable variable=artifactName; isSecret=false; isOutput=true]$artifactName.FullName"
-                  echo "$artifactName"
-                  echo "$artifactVersion"
-                displayName: 'Fetch Artifact Name'
               - task: 1ES.PublishNuget@1
                 displayName: 'NuGet push'
                 inputs:
                   packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Hidi.*.nupkg'
                   packageParentPath: '$(Pipeline.Workspace)'
                   nuGetFeedType: external
                   publishFeedCredentials: 'OpenAPI Nuget Connection'
-              - task: GitHubRelease@1
-                displayName: 'GitHub release (edit)'
-                condition: succeededOrFailed()
-                inputs:
-                  gitHubConnection: 'Github-MaggieKimani1'
-                  action: edit
-                  tagSource: userSpecifiedTag
-                  tag: '$(artifactVersion)'
-                  title: '$(artifactVersion)'
-                  releaseNotesSource: inline
-                  assets: '$(Pipeline.Workspace)\**\*.exe'
-                  changeLogType: issueBased
-                  changeLogLabels: '[ 
-                    { "label" : "feature-work", "feature", "displayName" : "New Features", "state" : "closed" }, 
-                    { "label" : "enhancement", "V2-Enhancement", "displayName" : "Enhancements", "state" : "closed" }, 
-                    { "label" : "bug", "bug-fix", "displayName" : "Bugs", "state" : "closed" }, 
-                    { "label" : "documentation", "doc", "displayName" : "Documentation", "state" : "closed"}, 
-                    { "label" : "dependencies", "displayName" : "Package Updates", "state" : "closed" }
-                    ]'
 
       - deployment: deploy_lib
         templateContext:
@@ -303,4 +275,49 @@ extends:
                   packagesToPush: '$(Pipeline.Workspace)/Nugets/Microsoft.OpenApi.Readers.*.nupkg'
                   packageParentPath: '$(Pipeline.Workspace)'
                   nuGetFeedType: external
-                  publishFeedCredentials: 'OpenAPI Nuget Connection'
+                  publishFeedCredentials: 'OpenAPI Nuget Connection'
+
+      - deployment: create_github_release
+        templateContext:
+          type: releaseJob
+          isProduction: true
+          inputs:
+          - input: pipelineArtifact
+            artifactName: Nugets
+            targetPath: '$(Pipeline.Workspace)'
+        dependsOn: []
+        environment: kiota-github-releases
+        strategy:
+          runOnce:
+            deploy:
+              pool:
+                vmImage: ubuntu-latest
+              steps:
+              - pwsh: |
+                  $artifactName = Get-ChildItem -Path $(Pipeline.Workspace)\Nugets -Filter Microsoft.OpenApi.*.nupkg -recurse | select -First 1
+                  $artifactVersion= $artifactName.Name -replace "Microsoft.OpenApi.", "" -replace ".nupkg", ""
+                  #Set Variable $artifactName and $artifactVersion
+                  Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false; isOutput=true]$artifactVersion"
+                  echo "$artifactVersion"
+                displayName: 'Fetch Artifact Name'
+                name: getTagVersion
+              - task: GitHubRelease@1
+                displayName: 'GitHub release (edit)'
+                condition: succeededOrFailed()
+                inputs:
+                  gitHubConnection: 'Github-MaggieKimani1'
+                  action: create
+                  tagSource: userSpecifiedTag
+                  tag: '$(getTagVersion.artifactVersion)'
+                  title: '$(getTagVersion.artifactVersion)'
+                  releaseNotesSource: inline
+                  assets: '$(Pipeline.Workspace)\**\*.exe'
+                  changeLogType: issueBased
+                  changeLogLabels: '[ 
+                    { "label" : "feature-work", "feature", "displayName" : "New Features", "state" : "closed" }, 
+                    { "label" : "enhancement", "V2-Enhancement", "displayName" : "Enhancements", "state" : "closed" }, 
+                    { "label" : "bug", "bug-fix", "displayName" : "Bugs", "state" : "closed" }, 
+                    { "label" : "documentation", "doc", "displayName" : "Documentation", "state" : "closed"}, 
+                    { "label" : "dependencies", "displayName" : "Package Updates", "state" : "closed" }
+                    ]'
+
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -3,15 +3,12 @@ name: CI/CD Pipeline
 on: [push, pull_request, workflow_dispatch]
 
 permissions:
-  contents: write
+  contents: read
 
 jobs:
   ci:
     name: Continuous Integration
     runs-on: ubuntu-latest
-    outputs:
-      latest_version: ${{ steps.tag_generator.outputs.new_version }}
-      is_default_branch: ${{ steps.conditionals_handler.outputs.is_default_branch }}
     env:
       ARTIFACTS_FOLDER: ${{ github.workspace }}/Artifacts
       GITHUB_RUN_NUMBER: ${{ github.run_number }}
@@ -21,43 +18,13 @@ jobs:
         with:
           dotnet-version: 8.0.x
 
-      - name: Data gatherer
-        id: data_gatherer
-        shell: pwsh
-        run: |
-          # Get default branch
-          $repo = 'microsoft/OpenAPI.NET'
-          $defaultBranch = Invoke-RestMethod -Method GET -Uri https://api.github.com/repos/$repo | Select-Object -ExpandProperty default_branch
-          Write-Output "::set-output name=default_branch::$(echo $defaultBranch)"
-
-      - name: Conditionals handler
-        id: conditionals_handler
-        shell: pwsh
-        run: |
-          $defaultBranch = "${{ steps.data_gatherer.outputs.default_branch }}"
-          $githubRef = "${{ github.ref }}"
-          $isDefaultBranch = 'false'
-          if ( $githubRef -like "*$defaultBranch*" ) {
-            $isDefaultBranch = 'true'
-          }
-          Write-Output "::set-output name=is_default_branch::$(echo $isDefaultBranch)"
-
       - name: Checkout repository
         id: checkout_repo
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
 
-      - if: steps.conditionals_handler.outputs.is_default_branch == 'true'
-        name: Bump GH tag
-        id: tag_generator
-        uses: mathieudutour/github-tag-action@v6.2
-        with: 
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          default_bump: false
-          release_branches: ${{ steps.data_gatherer.outputs.default_branch }}
-
       - name: Build projects
         id: build_projects
         shell: pwsh