GitLab fixes

Author: pjanotti

.gitlab-ci.yml

@@ -1842,71 +1842,75 @@ chef-release:
 .trigger-dotnet-instrumentation-deployer:
   only:
     variables:
-      - $CI_COMMIT_TAG =~ /^dotnet-instrumentation-deployer-ta-v[0-9]+\.[0-9]+\.[0-9]+$/
+      - $CI_COMMIT_TAG =~ /^dotnet-instrumentation-deployer-ta-v[0-9]+\.[0-9]+\.[0-9]+[^ ]*$/
   except:
     - schedules
 
 build-dotnet-instrumentation-deployer:
   extends: .trigger-dotnet-instrumentation-deployer
   image: '${DOCKER_HUB_REPO}/golang:${GO_VERSION}'
-  stage: build-dotnet-deployer
+  stage: build
+  needs: []
+  dependencies: []
   before_script:
     - cd packaging/dotnet-instr-deployer-add-on
   script:
+    - make download-dotnet-assets
     - make build
   artifacts:
     paths:
       - packaging/dotnet-instr-deployer-add-on/assets/windows_x86_64/bin/*
 
 sign-dotnet-instrumentation-deployer-exe:
   extends:
-    - .trigger-filter
+    - .trigger-dotnet-instrumentation-deployer
     - .submit-signing-request
-  stage: sign-dotnet-deployer
+  stage: sign-binaries
   retry: 2
-  needs:
+  dependencies:
     - build-dotnet-instrumentation-deployer
   variables:
     ARTIFACT: packaging/dotnet-instr-deployer-add-on/assets/windows_x86_64/bin/splunk_otel_dotnet_deployer.exe
     SIGN_TYPE: WIN
     DOWNLOAD_DIR: packaging/dotnet-instr-deployer-add-on/assets/windows_x86_64/bin
   artifacts:
     paths:
-      - packaging/dotnet-instr-deployer-add-on/assets/**/*
+      - packaging/dotnet-instr-deployer-add-on/assets/windows_x86_64/bin/*
+
 
 pack-dotnet-instrumentation-deployer:
   extends: .trigger-dotnet-instrumentation-deployer
   image: '${DOCKER_HUB_REPO}/golang:${GO_VERSION}'
-  stage: pack-dotnet-deployer
-  needs:
+  stage: package
+  dependencies:
     - sign-dotnet-instrumentation-deployer-exe
   before_script:
     - cd packaging/dotnet-instr-deployer-add-on
   script:
     - make pack
   artifacts:
     paths:
+      - packaging/dotnet-instr-deployer-add-on/assets/windows_x86_64/bin/*
       - packaging/dotnet-instr-deployer-add-on/out/distribution/splunk_otel_dotnet_deployer.tgz
 
 dotnet-instrumentation-deployer-release:
-  extends: .trigger-dotnet-instrumentation-deployer
-  image: '${DOCKER_HUB_REPO}/golang:${GO_VERSION}'
-  stage: release-dotnet-deployer
-  needs:
-    - pack-dotnet-instrumentation-deployer
-  before_script:
-    - cd packaging/dotnet-instr-deployer-add-on
+  extends:
+    - .trigger-dotnet-instrumentation-deployer
+    - .go-cache # Use this image since this job uses the ghr tool
+  stage: github-release
   dependencies:
-    - dotnet-instrumentation-deployer-builder
+    - pack-dotnet-instrumentation-deployer
   script:
+    - export
+    - cd packaging/dotnet-instr-deployer-add-on
     - pushd out/distribution/ && shasum -a 256 * > checksums.txt && popd
     - |
       set -e
       if [[ "${CI_COMMIT_TAG:-}" =~ ^dotnet-instrumentation-deployer-ta-v([0-9]+\.[0-9]+\.[0-9]+[^ ]*) ]]; then
         VERSION=${BASH_REMATCH[1]}
         VERSION_CHANGELOG="$(awk -v version="$VERSION" '/^## / { if (p) { exit }; if ($2 == version) { p=1; next } } p && NF' CHANGELOG.md)"
         SPLUNK_OTEL_DOTNET_VERSION=$(grep -oP 'version = \K.*' assets/windows_x86_64/bin/Splunk.OTel.DotNet.psm1 | tr -d '"')
-        RELEASE_NOTES=$(echo -e "$RELEASE_NOTES\n\nShipping Splunk OpenTelemetry .NET $SPLUNK_OTEL_DOTNET_VERSION")
+        RELEASE_NOTES=$(echo -e "$VERSION_CHANGELOG\n\nShipping Splunk OpenTelemetry .NET $SPLUNK_OTEL_DOTNET_VERSION")
         ghr -t "$GITHUB_TOKEN" -u signalfx -r splunk-otel-collector -prerelease -draft -n "Splunk OpenTelemetry .NET Deployer Technical Add-On v$VERSION" -b "$RELEASE_NOTES" -replace "$CI_COMMIT_TAG" out/distribution/
       else
         echo "Failed to get version from $CI_COMMIT_TAG"