Skip to content

Commit 5a5d3bf

Browse files
authored
Try to fix pushing
1 parent e7c43b8 commit 5a5d3bf

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,36 @@ jobs:
2121
- name: Synchronise repo and install essentials
2222
run: |
2323
emerge --sync
24-
emerge dev-vcs/git flaggie app-eselect/eselect-repository openssh sudo
24+
emerge dev-vcs/git flaggie app-eselect/eselect-repository openssh sudo gpg
2525
- name: Recreate git repo structure
2626
run: |
27-
git config --global user.name "github-actions"
27+
git config --global user.name "github-actions[bot]"
2828
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
2929
git config --global --add safe.directory "$(realpath .)"
3030
git init
3131
git branch -m main
32-
git remote add origin https://github.com/metacraft-labs/metacraft-overlay
32+
git remote add origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/metacraft-labs/metacraft-overlay
3333
git fetch --all
3434
git reset --hard origin/main
35+
- name: "Import bot's GPG key for signing commits"
36+
id: import-gpg
37+
uses: crazy-max/ghaction-import-gpg@v6
38+
with:
39+
gpg_private_key: ${{ secrets.CODETRACER_AUR_GPG_PRIVATE_KEY }}
40+
passphrase: ${{ secrets.CODETRACER_AUR_GPG_PRIVATE_KEY_PASS }}
41+
git_config_global: true
42+
git_user_signingkey: true
43+
git_commit_gpgsign: true
3544
- name: Update manifests
3645
run: |
3746
useradd -K MAIL_DIR=/dev/null -m builder
3847
chown -R builder $(pwd)
3948
echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
40-
sudo -E -u builder env HOME=/home/builder git config --global user.name "github-actions"
49+
sudo -E -u builder env HOME=/home/builder git config --global user.name "github-actions[bot]"
4150
sudo -E -u builder env HOME=/home/builder git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
4251
sudo -E -u builder env HOME=/home/builder git config --global init.defaultBranch main
4352
sudo -E -u builder env HOME=/home/builder git config --global commit.gpgsign true
4453
sudo -E -u builder env HOME=/home/builder git config --global tag.gpgsign true
45-
sudo -E -u builder env HOME=/home/builder git config --global gpg.format ssh
4654
4755
sudo -E -u builder mkdir -p /home/builder/.ssh
4856
echo "${{ secrets.CODETRACER_AUR_SSH_PRIVATE_KEY }}" | sudo -E -u builder tee /home/builder/.ssh/id_rsa > /dev/null
@@ -65,7 +73,7 @@ jobs:
6573
cd "${old}"
6674
done
6775
chown -R builder $(pwd)
68-
sudo -E -u builder git remote set-url origin git@github.com:metacraft-labs/metacraft-overlay
76+
sudo -E -u builder git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/metacraft-labs/metacraft-overlay
6977
sudo -E -u builder sh -c "(git add . && git commit -m 'Update manifest' && git push origin HEAD:main) || echo 'Nothing to commit'"
7078
- name: Sync and add repo
7179
run: |
@@ -80,5 +88,3 @@ jobs:
8088
- name: Install applications
8189
run: |
8290
emerge codetracer || exit
83-
84-

0 commit comments

Comments
 (0)