From 7d8602ca558ebf9678b8587e21f824b7f5f2628d Mon Sep 17 00:00:00 2001
From: RedYetiDev <38299977+RedYetiDev@users.noreply.github.com>
Date: Thu, 18 Jul 2024 15:30:07 -0400
Subject: [PATCH 1/3] meta: store actions secrets in environment

---
 .github/workflows/auto-start-ci.yml | 10 +++++++---
 .github/workflows/commit-queue.yml  | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/auto-start-ci.yml b/.github/workflows/auto-start-ci.yml
index c5c29881c85c68..76cdf9c7a4078a 100644
--- a/.github/workflows/auto-start-ci.yml
+++ b/.github/workflows/auto-start-ci.yml
@@ -59,11 +59,15 @@ jobs:
 
       - name: Setup @node-core/utils
         run: |
-          ncu-config set username ${{ secrets.JENKINS_USER }}
-          ncu-config set token "${{ secrets.GH_USER_TOKEN }}"
-          ncu-config set jenkins_token ${{ secrets.JENKINS_TOKEN }}
+          ncu-config set username $USERNAME
+          ncu-config set token $GH_TOKEN
+          ncu-config set jenkins_token $JENKINS_TOKEN
           ncu-config set owner "${{ github.repository_owner }}"
           ncu-config set repo "$(echo ${{ github.repository }} | cut -d/ -f2)"
+        env:
+          USERNAME: ${{ secrets.JENKINS_USER }}
+          GH_TOKEN: ${{ secrets.GH_USER_TOKEN }}
+          JENKINS_TOKEN: ${{ secrets.JENKINS_TOKEN }}
 
       - name: Start the CI
         run: ./tools/actions/start-ci.sh ${{ needs.get-prs-for-ci.outputs.numbers }}
diff --git a/.github/workflows/commit-queue.yml b/.github/workflows/commit-queue.yml
index 04c91cb40dc663..5a8f3a27787d97 100644
--- a/.github/workflows/commit-queue.yml
+++ b/.github/workflows/commit-queue.yml
@@ -86,11 +86,15 @@ jobs:
         run: |
           ncu-config set branch ${GITHUB_REF_NAME}
           ncu-config set upstream origin
-          ncu-config set username "${{ secrets.GH_USER_NAME }}"
-          ncu-config set token "${{ secrets.GH_USER_TOKEN }}"
-          ncu-config set jenkins_token "${{ secrets.JENKINS_TOKEN }}"
+          ncu-config set username $USERNAME
+          ncu-config set token $GH_TOKEN
+          ncu-config set jenkins_token $JENKINS_TOKEN
           ncu-config set repo "${REPOSITORY}"
           ncu-config set owner "${OWNER}"
+        env:
+          USERNAME: ${{ secrets.JENKINS_USER }}
+          GH_TOKEN: ${{ secrets.GH_USER_TOKEN }}
+          JENKINS_TOKEN: ${{ secrets.JENKINS_TOKEN }}
 
       - name: Start the Commit Queue
         run: ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} ${{ needs.get_mergeable_prs.outputs.numbers }}

From 7a0728620d8466e77489543229d7b79d2a36ac64 Mon Sep 17 00:00:00 2001
From: Aviv Keller <38299977+RedYetiDev@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:51:59 -0400
Subject: [PATCH 2/3] Update .github/workflows/auto-start-ci.yml

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
---
 .github/workflows/auto-start-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/auto-start-ci.yml b/.github/workflows/auto-start-ci.yml
index 76cdf9c7a4078a..15b35cea97b723 100644
--- a/.github/workflows/auto-start-ci.yml
+++ b/.github/workflows/auto-start-ci.yml
@@ -59,9 +59,9 @@ jobs:
 
       - name: Setup @node-core/utils
         run: |
-          ncu-config set username $USERNAME
-          ncu-config set token $GH_TOKEN
-          ncu-config set jenkins_token $JENKINS_TOKEN
+          ncu-config set username "$USERNAME"
+          ncu-config set token "$GH_TOKEN"
+          ncu-config set jenkins_token "$JENKINS_TOKEN"
           ncu-config set owner "${{ github.repository_owner }}"
           ncu-config set repo "$(echo ${{ github.repository }} | cut -d/ -f2)"
         env:

From ebb6f25f9704019cffd50521ec81b85fb027c5d2 Mon Sep 17 00:00:00 2001
From: Aviv Keller <38299977+RedYetiDev@users.noreply.github.com>
Date: Thu, 18 Jul 2024 17:52:22 -0400
Subject: [PATCH 3/3] Update commit-queue.yml

---
 .github/workflows/commit-queue.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/commit-queue.yml b/.github/workflows/commit-queue.yml
index 5a8f3a27787d97..9517c52f62a589 100644
--- a/.github/workflows/commit-queue.yml
+++ b/.github/workflows/commit-queue.yml
@@ -86,9 +86,9 @@ jobs:
         run: |
           ncu-config set branch ${GITHUB_REF_NAME}
           ncu-config set upstream origin
-          ncu-config set username $USERNAME
-          ncu-config set token $GH_TOKEN
-          ncu-config set jenkins_token $JENKINS_TOKEN
+          ncu-config set username "$USERNAME"
+          ncu-config set token "$GH_TOKEN"
+          ncu-config set jenkins_token "$JENKINS_TOKEN"
           ncu-config set repo "${REPOSITORY}"
           ncu-config set owner "${OWNER}"
         env: