From 15fc2910f5414762074c19714888d70009571a67 Mon Sep 17 00:00:00 2001 From: Daniel Haus Date: Mon, 22 Apr 2024 19:54:10 +0200 Subject: [PATCH 1/2] chore: use new creds for roxbot --- .github/workflows/package.yml | 6 +++--- .github/workflows/update-main-version.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 0b9e76f..1593e78 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -22,7 +22,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - token: ${{ secrets.PAT }} + token: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }} ref: ${{ github.ref_name }} - name: Setup Node.js 20.x @@ -42,8 +42,8 @@ jobs: - uses: chainguard-dev/actions/setup-gitsign@main - name: Commit Dist run: | - git config --global user.email "roxbot@stackrox.com" - git config --global user.name "Robot Rox" + git config --global user.email ${{ secrets.RHACS_BOT_GITHUB_EMAIL }} + git config --global user.name ${{ secrets.RHACS_BOT_GITHUB_USERNAME }} git add dist git commit -m "chore: Update dist" || echo "No changes to commit." git push origin diff --git a/.github/workflows/update-main-version.yml b/.github/workflows/update-main-version.yml index f93e9a7..e5104e9 100644 --- a/.github/workflows/update-main-version.yml +++ b/.github/workflows/update-main-version.yml @@ -29,8 +29,8 @@ jobs: - name: Move main version tag run: | - git config --global user.email "roxbot@stackrox.com" - git config --global user.name "Robot Rox" + git config --global user.email ${{ secrets.RHACS_BOT_GITHUB_EMAIL }} + git config --global user.name ${{ secrets.RHACS_BOT_GITHUB_USERNAME }} # Move the main version tag to the target tag. git tag -s -f ${{ github.event.inputs.main_version }} ${{ github.event.inputs.target }} git push origin ${{ github.event.inputs.main_version }} --force --tags From 9755bb24c1fd59fc0f1cdf59ad796804d0702698 Mon Sep 17 00:00:00 2001 From: Daniel Haus Date: Mon, 22 Apr 2024 20:15:36 +0200 Subject: [PATCH 2/2] Also add token in release flow --- .github/workflows/update-main-version.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-main-version.yml b/.github/workflows/update-main-version.yml index e5104e9..fda51fa 100644 --- a/.github/workflows/update-main-version.yml +++ b/.github/workflows/update-main-version.yml @@ -23,6 +23,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 # Required since we need to ensure all tags are contained within the checkout. + token: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }} - name: Setup GitSign uses: chainguard-dev/actions/setup-gitsign@main