From 0e7d4c20049b42464580c5ea77ae74cebcb140ab Mon Sep 17 00:00:00 2001
From: Ryan Mast <mast9@llnl.gov>
Date: Wed, 7 Feb 2024 11:35:06 -0800
Subject: [PATCH] Update 3rd party package repo workflows to use
 HELICS_PACKAGING_TOKEN

---
 .github/workflows/update-mingw-package.yml     | 8 ++++----
 .github/workflows/update-spack-package.yml     | 8 ++++----
 .github/workflows/update-yggdrasil-package.yml | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/update-mingw-package.yml b/.github/workflows/update-mingw-package.yml
index 57725ab..efe1672 100644
--- a/.github/workflows/update-mingw-package.yml
+++ b/.github/workflows/update-mingw-package.yml
@@ -23,13 +23,13 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: 'GMLC-TDC/MINGW-packages'
-        token: ${{ secrets.HELICS_BOT_TOKEN }}
+        token: ${{ secrets.HELICS_PACKAGING_TOKEN }}
         path: 'MINGW-packages'
     - name: Sync MINGW-packages fork with upstream
       working-directory: 'MINGW-packages'
-      run: |
-        echo "${{ secrets.HELICS_PACKAGING_TOKEN }}" | gh auth login --with-token
-        gh api repos/{owner}/{repo}/merge-upstream --field branch='{branch}'
+      env:
+        GH_TOKEN: ${{ secrets.HELICS_PACKAGING_TOKEN }}
+      run: gh api repos/{owner}/{repo}/merge-upstream --field branch='{branch}'
     - name: Set git config for commits
       run: |
         git config --global user.name "github-actions[bot]"
diff --git a/.github/workflows/update-spack-package.yml b/.github/workflows/update-spack-package.yml
index 45040aa..0914ea0 100644
--- a/.github/workflows/update-spack-package.yml
+++ b/.github/workflows/update-spack-package.yml
@@ -23,13 +23,13 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: 'GMLC-TDC/spack'
-        token: ${{ secrets.HELICS_BOT_TOKEN }}
+        token: ${{ secrets.HELICS_PACKAGING_TOKEN }}
         path: 'spack'
     - name: Sync Spack fork with upstream
       working-directory: 'spack'
-      run: |
-        echo "${{ secrets.HELICS_PACKAGING_TOKEN }}" | gh auth login --with-token
-        gh api repos/{owner}/{repo}/merge-upstream --field branch='{branch}'
+      env:
+        GH_TOKEN: ${{ secrets.HELICS_PACKAGING_TOKEN }}
+      run: gh api repos/{owner}/{repo}/merge-upstream --field branch='{branch}'
     - name: Set git config for commits
       run: |
         git config --global user.name "github-actions[bot]"
diff --git a/.github/workflows/update-yggdrasil-package.yml b/.github/workflows/update-yggdrasil-package.yml
index 302d56b..4822c10 100644
--- a/.github/workflows/update-yggdrasil-package.yml
+++ b/.github/workflows/update-yggdrasil-package.yml
@@ -23,13 +23,13 @@ jobs:
       uses: actions/checkout@v4
       with:
         repository: 'GMLC-TDC/Yggdrasil'
-        token: ${{ secrets.HELICS_BOT_TOKEN }}
+        token: ${{ secrets.HELICS_PACKAGING_TOKEN }}
         path: 'Yggdrasil'
     - name: Sync Yggdrasil fork with upstream
       working-directory: 'Yggdrasil'
-      run: |
-        echo "${{ secrets.HELICS_PACKAGING_TOKEN }}" | gh auth login --with-token
-        gh api repos/{owner}/{repo}/merge-upstream --field branch='{branch}'
+      env:
+        GH_TOKEN: ${{ secrets.HELICS_PACKAGING_TOKEN }}
+      run: gh api repos/{owner}/{repo}/merge-upstream --field branch='{branch}'
     - name: Set git config for commits
       run: |
         git config --global user.name "github-actions[bot]"