Skip to content

Commit bb969b1

Browse files
authored
Merge branch 'main' into FIX-COS-3682
2 parents f9c076a + 46ec982 commit bb969b1

16 files changed

Lines changed: 1102 additions & 638 deletions

File tree

.gemini/config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
have_fun: true
44
code_review:
55
disable: false
6-
comment_severity_threshold: MEDIUM
6+
comment_severity_threshold: "MEDIUM"
77
max_review_comments: -1
88
pull_request_opened:
99
help: false
10-
summary: false # turned off by default
10+
# Turned off by default
11+
summary: false
1112
code_review: true
1213
ignore_patterns: []

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@ jobs:
8686
root_part=$(sudo sfdisk -l -J "${device}" | jq -r '.partitiontable.partitions[] | select(.name == "root").node')
8787
sudo mount "${root_part}" /mnt/
8888
sudo ls /mnt/boot/grub2/grub.cfg
89-
[ $(sudo stat -c "%a" /mnt/boot/grub2/grub.cfg) == "600" ]
89+
for f in /mnt/boot/grub2/grub.cfg /mnt/boot/grub2/bootuuid.cfg /mnt/boot/grub2/grubenv; do
90+
perm=$(sudo stat -c '%a' "$f") || exit 1
91+
[ "$perm" == "600" ] || { echo "$f has permissions $perm (expected 600)"; exit 1; }
92+
done
9093
sudo umount /mnt
9194
sudo losetup -D "${device}"
9295
sudo rm -f myimage.raw
@@ -102,7 +105,10 @@ jobs:
102105
--disable-selinux --replace=alongside /target
103106
# Verify we injected static configs
104107
jq -re '.["static-configs"].version' /boot/bootupd-state.json
105-
[ $(sudo stat -c "%a" /boot/grub2/grub.cfg) == "600" ]
108+
for f in /boot/grub2/grub.cfg /boot/grub2/bootuuid.cfg /boot/grub2/grubenv; do
109+
perm=$(sudo stat -c '%a' "$f") || exit 1
110+
[ "$perm" == "600" ] || { echo "$f has permissions $perm (expected 600)"; exit 1; }
111+
done
106112
107113
- name: bootupctl generate-update-metadata
108114
run: |

0 commit comments

Comments
 (0)