Skip to content

Commit 872cef1

Browse files
service bot : switch to using org vars to hold the name and email
Signed-off-by: Simon Beaudoin <[email protected]>
1 parent 42138d2 commit 872cef1

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

.github/actions/push_to_repo/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ runs:
103103
104104
git add .
105105
106-
git config user.name "Github Service Bot"
107-
git config user.email "[email protected]"
106+
git config user.name "${{vars.DEB_PKG_BOT_CI_NAME}}"
107+
git config user.email "${{vars.DEB_PKG_BOT_CI_EMAIL}}"
108108
109109
git commit -s -m "Uploaded Package ${{env.BUILT_PACKAGE_NAME}} at version ${{env.BUILT_PACKAGE_VERSION}} for distro ${{env.UBUNTU_CODENAME}}"
110110

.github/workflows/qcom-container-build-and-upload.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ permissions:
1515
security-events: write
1616

1717
env:
18-
GITHUB_SERVICE_BOT_USERNAME: "qcom-service-bot"
19-
2018
QCOM_ORG_NAME: "qualcomm-linux"
2119

2220
IMAGE_NAME: "pkg-builder"
@@ -29,7 +27,7 @@ jobs:
2927
steps:
3028

3129
- name: Authenticate to GHCR
32-
run: echo ${{ secrets.DEB_PKG_BOT_CI_TOKEN }} | docker login ghcr.io -u ${{env.GITHUB_SERVICE_BOT_USERNAME}} --password-stdin
30+
run: echo ${{ secrets.DEB_PKG_BOT_CI_TOKEN }} | docker login ghcr.io -u ${{ vars.DEB_PKG_BOT_CI_USERNAME }} --password-stdin
3331

3432
- name: Build and Tag the Image
3533
run: docker build -t ghcr.io/${{env.QCOM_ORG_NAME}}/${{env.IMAGE_NAME}}:latest .

.github/workflows/qcom-promote-upstream-reusable-workflow.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ jobs:
174174
run: |
175175
cd ./package-repo
176176
177-
git config user.name "Github Service Bot"
178-
git config user.email "[email protected]"
179-
177+
git config user.name "${{vars.DEB_PKG_BOT_CI_NAME}}"
178+
git config user.email "${{vars.DEB_PKG_BOT_CI_EMAIL}}"
179+
180180
git checkout -b debian/pr/${{env.NORMALIZED_VERSION}}-1
181181
182182
# Run gbp with --no-merge, this is because we do not want gbp to perform the final merging of upstream/latest into debian/latest
@@ -211,8 +211,8 @@ jobs:
211211
run: |
212212
cd ./package-repo
213213
214-
export DEBFULLNAME="Github Service Bot"
215-
export DEBEMAIL=[email protected]
214+
export DEBFULLNAME="${{vars.DEB_PKG_BOT_CI_NAME}}"
215+
export DEBEMAIL="${{vars.DEB_PKG_BOT_CI_EMAIL}}"
216216
217217
# use ignore branch because we are not on default debian branch
218218
gbp dch \

.github/workflows/qcom-upstream-pr-pkg-build-reusable-workflow.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ jobs:
126126
run: |
127127
cd ./package-repo
128128
129-
git config user.name "Github Service Bot"
130-
git config user.email "[email protected]"
129+
git config user.name "${{vars.DEB_PKG_BOT_CI_NAME}}"
130+
git config user.email "${{vars.DEB_PKG_BOT_CI_EMAIL}}"
131131
132132
git checkout upstream/latest
133133
git checkout debian/latest
@@ -176,8 +176,8 @@ jobs:
176176
run: |
177177
cd ./package-repo
178178
179-
export DEBFULLNAME="Github Service Bot"
180-
export DEBEMAIL=[email protected]
179+
export DEBFULLNAME="${{vars.DEB_PKG_BOT_CI_NAME}}"
180+
export DEBEMAIL="${{vars.DEB_PKG_BOT_CI_EMAIL}}"
181181
182182
# use ignore branch because we are not on default debian branch
183183
# use -b to ignore new version is less than current version. This happens because of the ~pr#

0 commit comments

Comments
 (0)