Skip to content

Commit 05aaa8f

Browse files
author
MochiOS Team
committed
fix ci: match gpg key location with GNUPGHOME
key was generated at /github/home/.gnupg but build step used GNUPGHOME=/root/.gnupg swapping both to /home/mochi/.mochios-gnupg (which matches build.sh default) so the mochi user can actually find the signing key
1 parent 6262bb5 commit 05aaa8f

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

‎.github/workflows/build-iso.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ jobs:
3434
3535
- name: create signing key
3636
run: |
37+
mkdir -p /home/mochi/.mochios-gnupg /tmp/mochios/repo/pubkey
38+
chown -R mochi:mochi /home/mochi/.mochios-gnupg
3739
cd /tmp/mochios
38-
mkdir -p repo/pubkey
39-
printf 'Key-Type: RSA\nKey-Length: 2048\nName-Real: MochiOS CI\nName-Email: ci@mochios.dev\nExpire-Date: 0\n%%no-protection\n' | gpg --batch --gen-key 2>&1
40-
gpg --export --armor ci@mochios.dev > repo/pubkey/mochios-key.pub
40+
printf 'Key-Type: RSA\nKey-Length: 2048\nName-Real: MochiOS CI\nName-Email: ci@mochios.dev\nExpire-Date: 0\n%%no-protection\n' | gpg --homedir /home/mochi/.mochios-gnupg --batch --gen-key 2>&1
41+
gpg --homedir /home/mochi/.mochios-gnupg --export --armor ci@mochios.dev > repo/pubkey/mochios-key.pub
42+
chmod 644 /home/mochi/.mochios-gnupg/pubring.kbx /home/mochi/.mochios-gnupg/trustdb.gpg 2>/dev/null || true
4143
4244
- name: create secure boot keys
4345
run: |
@@ -52,7 +54,7 @@ jobs:
5254
mkdir -p /tmp/mochios-work /tmp/mochios/out
5355
MOCHIOS_DIR=/tmp/mochios \
5456
WORK_DIR=/tmp/mochios-work \
55-
GNUPGHOME=/root/.gnupg \
57+
GNUPGHOME=/home/mochi/.mochios-gnupg \
5658
SIGN_KEY=ci@mochios.dev \
5759
bash /tmp/mochios/build.sh 2>&1
5860

0 commit comments

Comments
 (0)