From 2f87cfecf46ef44c4bfbc0db01bdb86e62eac296 Mon Sep 17 00:00:00 2001
From: Tuomas Koivusalo <tuomas.koivusalo@gmail.com>
Date: Mon, 25 Nov 2024 00:37:40 +0200
Subject: [PATCH] fixes

---
 azure-pipelines-solution.yml | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/azure-pipelines-solution.yml b/azure-pipelines-solution.yml
index 9cb1994..4af6b2c 100644
--- a/azure-pipelines-solution.yml
+++ b/azure-pipelines-solution.yml
@@ -92,7 +92,6 @@ stages:
               command: apply
               environmentServiceNameAzureRM: FDF-PVARKI-SOLUTION-Dev
 
-<<<<<<< HEAD
           # - task: Bash@3
           #   displayName: Create github issue
           #   inputs:
@@ -101,7 +100,7 @@ stages:
           #     script: |
           #       echo "Creating a GitHub issue..."
           #       curl -X POST \
-          #         -H "Authorization: Bearer $(#GITHUB_TOKEN)" \
+          #         # -H "Authorization: Bearer $(GitHubToken)" \
           #         -H "Accept: application/vnd.github.v3+json" \
           #         https://api.github.com/repos/pvarki/terraform-miniwerk-deployment/issues \
           #         -d '{
@@ -112,32 +111,8 @@ stages:
           #     displayName: 'Create GitHub Issue'
           #     workingDirectory: $(System.DefaultWorkingDirectory)
           #     env:
-          #       GITHUB_TOKEN: $(serviceConnection.github_connector.auth.token)
-          #       DEPLOYMENT_NAME: ${{ parameters.DEPLOYMENT_NAME }}
-          #       WORKSPACE_NAME: ${{ parameters.WORKSPACE_NAME }}
-=======
-          - task: Bash@3
-            displayName: Create github issue
-            inputs:
-              targetType: 'inline'
-              connection: github_connector
-              script: |
-                echo "Creating a GitHub issue..."
-                curl -X POST \
-                  -H "Authorization: Bearer $(GitHubToken)" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  https://api.github.com/repos/pvarki/terraform-miniwerk-deployment/issues \
-                  -d '{
-                    "title": "Automated Issue: Created ${{ parameters.DEPLOYMENT_NAME }} with workspace ${{ parameters.WORKSPACE_NAME }}",
-                    "body": "This issue was created by an Azure DevOps pipeline using the GitHub service connection.",
-                    "labels": ["automation","instance"]
-                  }'
-              displayName: 'Create GitHub Issue'
-              workingDirectory: $(System.DefaultWorkingDirectory)
-            env:
-              GitHubToken: $(serviceConnection.github_connector.auth.token)
->>>>>>> azurepipelines
-              
+          #       GitHubToken: $(serviceConnection.github_connector.auth.token)
+
   - stage: destroy_resources
     displayName: Destroy miniwerk resources
     jobs: