Skip to content

Commit ca9036d

Browse files
Merge pull request #143 from Githubguy132010/QOL-fixes
Refactor delete-old-releases workflow and enhance pacman configuration
2 parents c0d3763 + 00a01ad commit ca9036d

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

.github/workflows/delete-old-releases.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
name: Delete Old Releases
22

33
on:
4-
release:
5-
types: [created, published]
6-
workflow_dispatch:
7-
schedule:
8-
- cron: '0 0 * * *'
4+
workflow_run:
5+
workflows: ["Build ISO"]
6+
types:
7+
- completed
98

109
jobs:
1110
delete-old-releases:

pacman.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ Architecture = auto
3030

3131
# Misc options
3232
#UseSyslog
33+
# Color output enabled
3334
Color
34-
ILoveCandy
35-
ParallelDownloads = 16
35+
ILoveCandy # enable candy output
36+
ParallelDownloads = 64 # increased for build speed
3637
# We cannot check disk space from within a chroot environment
37-
#CheckSpace
38-
VerbosePkgLists
38+
#CheckSpace # enable disk space checks
39+
#VerbosePkgLists
3940
DownloadUser = alpm
4041
#DisableSandbox
4142

scripts/entrypoint.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,19 @@ build_iso() {
3232

3333
# Create necessary directories
3434
mkdir -p "$output_dir"
35+
mkdir -p "$work_dir"
3536

3637
# Run the mirror selection script
3738
log "Selecting fastest mirrors..."
3839
./scripts/select-mirrors.sh || warn "Mirror selection failed, continuing with default mirrors"
3940

40-
# Disable PC speaker module if present
41-
if grep -q "pcspkr" /etc/modprobe.d/nobeep.conf 2>/dev/null; then
42-
log "PC speaker already disabled in configuration."
41+
# Disable PC speaker module in airootfs if present
42+
if [ -f "airootfs/etc/modprobe.d/nobeep.conf" ] \
43+
&& grep -q "pcspkr" airootfs/etc/modprobe.d/nobeep.conf 2>/dev/null \
44+
&& grep -q "snd_pcsp" airootfs/etc/modprobe.d/nobeep.conf 2>/dev/null; then
45+
log "PC speaker already disabled in airootfs configuration."
4346
else
44-
log "Disabling PC speaker in configuration..."
47+
log "Disabling PC speaker in airootfs configuration..."
4548
mkdir -p airootfs/etc/modprobe.d/
4649
echo "blacklist pcspkr" > airootfs/etc/modprobe.d/nobeep.conf
4750
echo "blacklist snd_pcsp" >> airootfs/etc/modprobe.d/nobeep.conf
@@ -76,6 +79,7 @@ EOF
7679
# Set bell-style none in global inputrc
7780
if [ ! -f "airootfs/etc/inputrc" ]; then
7881
log "Setting bell-style none in global inputrc..."
82+
mkdir -p airootfs/etc
7983
echo "set bell-style none" > airootfs/etc/inputrc
8084
fi
8185

@@ -86,12 +90,9 @@ EOF
8690
# Note: We don't modify profiledef.sh anymore as -Xthreads is not supported by mksquashfs
8791
# The profiledef.sh file already has proper XZ compression settings
8892

89-
# Run mkarchiso with verbose option only
93+
# Run mkarchiso with verbose option and handle errors
9094
log "Building Arch ISO with mkarchiso..."
91-
mkarchiso -v -w "$work_dir" -o "$output_dir" .
92-
93-
# Check if build was successful
94-
if [ $? -eq 0 ]; then
95+
if mkarchiso -v -w "$work_dir" -o "$output_dir" .; then
9596
log "ISO build completed successfully!"
9697
log "ISO available at: $output_dir"
9798
else

0 commit comments

Comments
 (0)