Skip to content

Commit ec5cf94

Browse files
authored
Revert to github CI
1 parent db2ffeb commit ec5cf94

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010

1111
jobs:
1212
gentoo-job:
13-
runs-on: [self-hosted, nixos] # GitHub Actions host runner
13+
runs-on: ubuntu-latest # GitHub Actions host runner
1414
container:
1515
image: gentoo/stage3:desktop # Pulls the Gentoo image from Docker Hub
1616
steps:
@@ -24,28 +24,28 @@ jobs:
2424
emerge dev-vcs/git flaggie app-eselect/eselect-repository openssh sudo
2525
- name: Recreate git repo structure
2626
run: |
27-
# git config --global user.name
28-
# git config --global user.email
27+
git config --global user.name "github-actions"
28+
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
2929
git config --global --add safe.directory "$(realpath .)"
3030
git init
31-
git branch -m main
31+
git branch -m master
3232
git remote add origin https://github.com/metacraft-labs/metacraft-overlay
3333
git fetch --all
34-
git reset --hard origin/main
34+
git reset --hard origin/master
3535
- name: Update manifests
3636
run: |
3737
useradd -K MAIL_DIR=/dev/null -m builder
3838
chown -R builder $(pwd)
3939
echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
40-
# sudo -E -u builder env HOME=/home/builder git config --global user.name
41-
# sudo -E -u builder env HOME=/home/builder git config --global user.email
40+
sudo -E -u builder env HOME=/home/builder git config --global user.name "github-actions"
41+
sudo -E -u builder env HOME=/home/builder git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
4242
sudo -E -u builder env HOME=/home/builder git config --global init.defaultBranch main
4343
sudo -E -u builder env HOME=/home/builder git config --global commit.gpgsign true
4444
sudo -E -u builder env HOME=/home/builder git config --global tag.gpgsign true
4545
sudo -E -u builder env HOME=/home/builder git config --global gpg.format ssh
4646
4747
sudo -E -u builder mkdir -p /home/builder/.ssh
48-
echo "${{ secrets.ACTIONS_GENTOO_SSH_KEY }}" | sudo -E -u builder tee /home/builder/.ssh/id_rsa > /dev/null
48+
echo "${{ secrets.CODETRACER_AUR_SSH_PRIVATE_KEY }}" | sudo -E -u builder tee /home/builder/.ssh/id_rsa > /dev/null
4949
sudo -E -u builder chmod 600 /home/builder/.ssh/id_rsa
5050
5151
sudo -E -u builder env HOME=/home/builder git config --global user.signingkey /home/builder/.ssh/id_rsa
@@ -66,11 +66,17 @@ jobs:
6666
done
6767
chown -R builder $(pwd)
6868
sudo -E -u builder git remote set-url origin [email protected]:metacraft-labs/metacraft-overlay
69-
# sudo -E -u builder sh -c "(git add . && git commit -m 'Update manifest' && git push origin HEAD:main) || echo 'Nothing to commit'"
69+
sudo -E -u builder sh -c "(git add . && git commit -m 'Update manifest' && git push origin HEAD:master) || echo 'Nothing to commit'"
7070
- name: Sync and add repo
7171
run: |
72-
eselect repository add metacraft-overlay git https://github.com/metacraft-labs/metacraft-overlay.git || exit
72+
eselect repository add untitled-desktop-overlay git https://github.com/metacraft-labs/metacraft-overlay.git || exit
7373
emerge --sync metacraft-overlay || exit
74+
- name: Configure use flags
75+
run: |
76+
flaggie raft +lz4
77+
flaggie xdelta +lzma
78+
flaggie squashfs-tools +lzma
79+
flaggie libcap +static-libs
7480
- name: Install applications
7581
run: |
7682
emerge codetracer || exit

0 commit comments

Comments
 (0)