Prepare for merge

m-kuhn · May 13, 2024 · ad03cab · ad03cab
1 parent 2d8a9d1
commit ad03cab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/windows-qt6.yml b/.github/workflows/windows-qt6.yml
@@ -3,7 +3,7 @@ name: 🪟 Windows Qt6
 on:
   push:
     branches:
-      - windows-qt6
+      - master
       - release-**
   pull_request:
   release:
@@ -80,7 +80,7 @@ jobs:
                 -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -D WITH_QTWEBKIT=OFF \
                 -D VCPKG_INSTALL_OPTIONS="--x-buildtrees-root=C:/src" \
-                -D NUGET_USERNAME=m-kuhn \
+                -D NUGET_USERNAME=${{ github.actor }} \
                 -D NUGET_TOKEN=${{ secrets.GITHUB_TOKEN }}
 
       - name: 🌋 Build
@@ -106,4 +106,4 @@ jobs:
         with:
           name: qgis-windows-qt6
           path: |
-            build/*-win64.zip
+            build/*-win64.zip
diff --git a/cmake/VcpkgToolchain.cmake b/cmake/VcpkgToolchain.cmake
@@ -1,5 +1,5 @@
-set(NUGET_SOURCE "https://nuget.pkg.github.com/m-kuhn/index.json")
-set(NUGET_USERNAME "m-kuhn" CACHE STRING "Nuget user")
+set(NUGET_SOURCE "https://nuget.pkg.github.com/qgis/index.json" CACHE STRING "Nuget source")
+set(NUGET_USERNAME "qgis" CACHE STRING "Nuget user")
 
 # Setup features (dependencies) based on cmake configuration
 if(WITH_BINDINGS)
@@ -39,7 +39,7 @@ if(NOT "${NUGET_TOKEN}" STREQUAL "" AND WIN32)
     "${_CONFIG_PATH}"
     @ONLY)
   execute_process(
-    COMMAND ${_NUGET_EXE} setapikey "${NUGET_TOKEN}" -src "https://nuget.pkg.github.com/m-kuhn/index.json" -configfile ${_CONFIG_PATH}
+    COMMAND ${_NUGET_EXE} setapikey "${NUGET_TOKEN}" -src ${NUGET_SOURCE} -configfile ${_CONFIG_PATH}
     OUTPUT_VARIABLE _OUTPUT
     ERROR_VARIABLE _ERROR
     RESULT_VARIABLE _RESULT)