Merge branch 'fix-windows-upload' into 'main'

Upload artifacts from conan-windows-release-package jobs See merge request rewriting/ddisasm!905
GrammaTech · Jul 6, 2022 · 7026bf2 · 7026bf2
2 parents 5953177 + d4c5f9d
commit 7026bf2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.ci/gitlab-ci.yml b/.ci/gitlab-ci.yml
@@ -659,15 +659,15 @@ internal-focal-stable:
   trigger:
     project: rewriting/utility/package-uploader
     strategy: depend
-  needs: [conan-windows-release]
+  needs: [conan-windows-release-package]
 
 windows-upload-public:
   <<: *windows-upload
   rules:
     - if: '$CI_COMMIT_REF_NAME =~ /^release-.*/'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   variables:
-    JOB_NAME: conan-windows-release
+    JOB_NAME: conan-windows-release-package
     FILESERVER: public
     FILESERVER_SUBDIR_NAME: windows-release
 
@@ -677,6 +677,6 @@ windows-upload-internal:
     - if: '$CI_COMMIT_REF_NAME =~ /^release-.*/'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   variables:
-    JOB_NAME: conan-windows-release
+    JOB_NAME: conan-windows-release-package
     FILESERVER: internal
     FILESERVER_SUBDIR_NAME: windows-release