fix: 🐛 Stop Devops from building and releasing, GH Actions will now c…

…all the APT Build
anojht · Oct 1, 2021 · 1fda2a1 · 1fda2a1
1 parent 97987d0
commit 1fda2a1
Show file tree

Hide file tree

Showing 2 changed files with 94 additions and 88 deletions.
diff --git a/.azuredevops/pipelines/publish-job.yml b/.azuredevops/pipelines/publish-job.yml
@@ -45,74 +45,74 @@ stages:
     steps:
       - template: templates/publish-os-steps.yml
 
-- stage: deploy
-  jobs:
-  - job:
-    condition: and(succeeded(), eq(variables.isMain, true))
-    steps:
-    - task: DownloadPipelineArtifact@2
-      inputs:
-        buildType: 'current'
-        targetPath: '$(System.ArtifactsDirectory)'
+# - stage: deploy
+#   jobs:
+#   - job:
+#     condition: and(succeeded(), eq(variables.isMain, true))
+#     steps:
+#     - task: DownloadPipelineArtifact@2
+#       inputs:
+#         buildType: 'current'
+#         targetPath: '$(System.ArtifactsDirectory)'
 
-    - task: PowerShell@2
-      displayName: 'Get Release Notes'
-      inputs:
-        targetType: 'inline'
-        script: |
-          $response = Invoke-WebRequest -Uri "https://ombireleasenote.azurewebsites.net/api/ReleaseNotesFunction?buildId=$(Build.BuildId)"
-          Write-Host "##vso[task.setvariable variable=ReleaseNotes;]$response"
+#     - task: PowerShell@2
+#       displayName: 'Get Release Notes'
+#       inputs:
+#         targetType: 'inline'
+#         script: |
+#           $response = Invoke-WebRequest -Uri "https://ombireleasenote.azurewebsites.net/api/ReleaseNotesFunction?buildId=$(Build.BuildId)"
+#           Write-Host "##vso[task.setvariable variable=ReleaseNotes;]$response"
 
-    - task: GitHubRelease@1
-      displayName: 'Ombi.Releases Release'
-      inputs:
-        gitHubConnection: 'PAT'
-        repositoryName: 'Ombi-app/Ombi.Releases'
-        action: 'create'
-        target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672'
-        tagSource: 'userSpecifiedTag'
-        tag: '$(gitTag)'
-        releaseNotesSource: 'inline'
-        releaseNotesInline: '$(ReleaseNotes)'
-        assets: |
-          $(System.ArtifactsDirectory)/**/*.zip
-          $(System.ArtifactsDirectory)/**/*.tar.gz
-        isPreRelease: true
-        changeLogCompareToRelease: 'lastNonDraftRelease'
-        changeLogType: 'commitBased'
+#     - task: GitHubRelease@1
+#       displayName: 'Ombi.Releases Release'
+#       inputs:
+#         gitHubConnection: 'PAT'
+#         repositoryName: 'Ombi-app/Ombi.Releases'
+#         action: 'create'
+#         target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672'
+#         tagSource: 'userSpecifiedTag'
+#         tag: '$(gitTag)'
+#         releaseNotesSource: 'inline'
+#         releaseNotesInline: '$(ReleaseNotes)'
+#         assets: |
+#           $(System.ArtifactsDirectory)/**/*.zip
+#           $(System.ArtifactsDirectory)/**/*.tar.gz
+#         isPreRelease: true
+#         changeLogCompareToRelease: 'lastNonDraftRelease'
+#         changeLogType: 'commitBased'
 
-    - task: GitHubRelease@1
-      displayName: 'Ombi Release'
-      inputs:
-        gitHubConnection: 'PAT'
-        repositoryName: 'Ombi-app/Ombi'
-        action: 'create'
-        target: '$(Build.SourceVersion)'
-        tagSource: 'userSpecifiedTag'
-        tag: '$(gitTag)'
-        releaseNotesSource: 'inline'
-        releaseNotesInline: '$(ReleaseNotes)'
-        assets: |
-          $(System.ArtifactsDirectory)/**/*.zip
-          $(System.ArtifactsDirectory)/**/*.tar.gz
-        isPreRelease: true
-        changeLogCompareToRelease: 'lastNonDraftRelease'
-        changeLogType: 'commitBased'
+#     - task: GitHubRelease@1
+#       displayName: 'Ombi Release'
+#       inputs:
+#         gitHubConnection: 'PAT'
+#         repositoryName: 'Ombi-app/Ombi'
+#         action: 'create'
+#         target: '$(Build.SourceVersion)'
+#         tagSource: 'userSpecifiedTag'
+#         tag: '$(gitTag)'
+#         releaseNotesSource: 'inline'
+#         releaseNotesInline: '$(ReleaseNotes)'
+#         assets: |
+#           $(System.ArtifactsDirectory)/**/*.zip
+#           $(System.ArtifactsDirectory)/**/*.tar.gz
+#         isPreRelease: true
+#         changeLogCompareToRelease: 'lastNonDraftRelease'
+#         changeLogType: 'commitBased'
 
-    - task: PowerShell@2
-      displayName: "Trigger APT build"
-      inputs:
-        targetType: 'inline'
-        script: |
-          $body = @{
-            "ref"="main"
-            "inputs"= @{"version"= "$(gitTag)"}
-          } | ConvertTo-Json
+#     - task: PowerShell@2
+#       displayName: "Trigger APT build"
+#       inputs:
+#         targetType: 'inline'
+#         script: |
+#           $body = @{
+#             "ref"="main"
+#             "inputs"= @{"version"= "$(gitTag)"}
+#           } | ConvertTo-Json
 
-          $header = @{
-            "Accept"="application/vnd.github.v3+json"
-            "Authorization"="Bearer $(APTPAT)"
-            "User-Agent"="Ombi"
-          } 
+#           $header = @{
+#             "Accept"="application/vnd.github.v3+json"
+#             "Authorization"="Bearer $(APTPAT)"
+#             "User-Agent"="Ombi"
+#           } 
 
-          Invoke-RestMethod -Uri "https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches" -Method 'Post' -Body $body -Headers $header
+#           Invoke-RestMethod -Uri "https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches" -Method 'Post' -Body $body -Headers $header
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,8 +4,6 @@ on:
   push:
     # branches: [ develop, feature/** ]
     branches: [ releaseNotes ]
-  pull_request:
-    branches: [ develop ]
 
 jobs:
   build-ui:
@@ -182,43 +180,51 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      # - name: Conventional Changelog Action
-      #   id: changelog
-      #   uses: TriPSs/conventional-changelog-action@v3
-      #   with:
-      #     github-token: ${{ secrets.github_token }}
-      #     git-message: 'chore(release): {version}'
-      #     version-file: 'version.json'
-      #     output-file: 'CHANGELOG.md'
+      - name: Conventional Changelog Action
+        id: changelog
+        uses: TriPSs/conventional-changelog-action@v3
+        with:
+          github-token: ${{ secrets.github_token }}
+          git-message: 'chore(release): {version}'
+          version-file: 'version.json'
+          output-file: 'CHANGELOG.md'
 
       - name: Download Artifacts
         id: download
         uses: actions/download-artifact@v2
         with:
           path: artifacts
 
+      - name: Publish to GitHub
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          body: ${{ steps.changelog.outputs.clean_changelog }}
+          draft: 'true'
+          name: ${{ steps.changelog.outputs.tag }}
+          tag_name: ${{ steps.changelog.outputs.tag }}
+          files: |
+            artifacts/**/*.tar.gz
+            artifacts/**/*.zip
+
       # - name: Publish to GitHub
       #   uses: softprops/action-gh-release@v1
       #   # if: startsWith(github.ref, 'refs/tags/')
       #   with:
-      #     body: ${{ steps.changelog.outputs.clean_changelog }}
+      #     body: 'Test'
       #     draft: 'true'
-      #     name: ${{ steps.changelog.outputs.tag }}
-      #     tag_name: ${{ steps.changelog.outputs.tag }}
+      #     name: 'Test'
       #     files: |
       #       artifacts/**/*.tar.gz
       #       artifacts/**/*.zip
 
-      - name: Publish to GitHub
-        uses: softprops/action-gh-release@v1
-        # if: startsWith(github.ref, 'refs/tags/')
+      - name: Trigger APT Build
+        uses: fjogeleit/http-request-action@master
         with:
-          body: 'Test'
-          draft: 'true'
-          name: 'Test'
-          files: |
-            artifacts/**/*.tar.gz
-            artifacts/**/*.zip
-
+          url: 'https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches'
+          method: 'POST'
+          contentType: 'application/json'
+          data: "{ 'ref':'main', 'inputs': { 'version': '${{ steps.changelog.outputs.tag }}'} }"
+          customHeaders: "{'Accept':'application/vnd.github.v3+json', 'Authorization':'Bearer ${{secrets.APT_PAT}}', 'User-Agent':'Ombi'}"