Skip to content

Commit 622978b

Browse files
committed
fixes
1 parent ea0d3cc commit 622978b

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/build_bootstrap_images_x86_64.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
with:
134134
name: ARTIFACTS
135135
path: |
136-
"${{ matrix.file }}"
136+
${{ matrix.file }}
137137
compression-level: 0 #no compression, [Default: 6 (GNU Gzip)]
138138
retention-days: 90 #max
139139
overwrite: true
@@ -150,7 +150,7 @@ jobs:
150150
draft: false
151151
generate_release_notes: false
152152
files: |
153-
"${{ matrix.file }}"
153+
${{ matrix.file }}
154154
continue-on-error: true
155155

156156
#Snapshot
@@ -165,7 +165,7 @@ jobs:
165165
generate_release_notes: false
166166
make_latest: false
167167
files: |
168-
"${{ matrix.file }}"
168+
${{ matrix.file }}
169169
continue-on-error: true
170170

171171
#Build Provenance
@@ -174,6 +174,6 @@ jobs:
174174
uses: actions/[email protected]
175175
with:
176176
subject-name: "image-${{ matrix.image }}-${{ matrix.arch }}"
177-
subject-path: "${{ matrix.file }}"
177+
subject-path: ${{ matrix.file }}
178178
show-summary: true
179179
continue-on-error: true

Github/Runners/bootstrap/cachyos.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fi
3939
cat "/var/lib/dbus/machine-id" | tee "/etc/machine-id"
4040
pacman -Scc --noconfirm
4141
echo "disable-scdaemon" | tee "/etc/pacman.d/gnupg/gpg-agent.conf"
42-
curl -qfsSL "https://raw.githubusercontent.com/pkgforge/flatimage-base/refs/heads/main/archlinux_hooks.sh" -o "/arch_hooks.sh"
42+
curl -qfsSL "https://raw.githubusercontent.com/pkgforge/devscripts/refs/heads/main/Github/Runners/bootstrap/archlinux_hooks.sh" -o "/arch_hooks.sh"
4343
chmod +x "/arch_hooks.sh" ; "/arch_hooks.sh"
4444
rm -rfv "/arch_hooks.sh"
4545
echo "LANG=en_US.UTF-8" | tee "/etc/locale.conf"
@@ -102,7 +102,6 @@ fi
102102
##Export
103103
docker export "$(docker ps -aqf 'name=cachyos-base')" --output "rootfs.tar"
104104
if [[ -f "./rootfs.tar" ]] && [[ $(stat -c%s "./rootfs.tar") -gt 10000 ]]; then
105-
mkdir -pv "./rootfs" && export ROOTFS_DIR="$(realpath "./rootfs")"
106105
rsync -achLv --mkpath "./rootfs.tar" "/tmp/cachyos-base.tar"
107106
else
108107
echo "\n[-] FATAL: Failed to export ROOTFS\n"
@@ -121,15 +120,15 @@ export D_ID D_TAG
121120
#Tags
122121
docker commit "${D_ID}" "pkgforge/cachyos-base:latest"
123122
docker commit "${D_ID}" "ghcr.io/pkgforge/devscripts/cachyos-base:latest"
124-
docker commit "${D_ID}" "pkgforge/cachyos-base:${DOCKER_TAG}"
125-
docker commit "${D_ID}" "ghcr.io/pkgforge/devscripts/cachyos-base:${DOCKER_TAG}"
123+
docker commit "${D_ID}" "pkgforge/cachyos-base:${D_TAG}"
124+
docker commit "${D_ID}" "ghcr.io/pkgforge/devscripts/cachyos-base:${D_TAG}"
126125
docker commit "${D_ID}" "pkgforge/cachyos-base:$(uname -m)"
127126
docker commit "${D_ID}" "ghcr.io/pkgforge/devscripts/cachyos-base:$(uname -m)"
128127
#Push
129128
docker push "pkgforge/cachyos-base:latest"
130129
docker push "ghcr.io/pkgforge/devscripts/cachyos-base:latest"
131-
docker push "pkgforge/cachyos-base:${DOCKER_TAG}"
132-
docker push "ghcr.io/pkgforge/devscripts/cachyos-base:${DOCKER_TAG}"
130+
docker push "pkgforge/cachyos-base:${D_TAG}"
131+
docker push "ghcr.io/pkgforge/devscripts/cachyos-base:${D_TAG}"
133132
docker push "pkgforge/cachyos-base:$(uname -m)"
134133
docker push "ghcr.io/pkgforge/devscripts/cachyos-base:$(uname -m)"
135134
#-------------------------------------------------------#

0 commit comments

Comments
 (0)