Skip to content

Commit e0307d6

Browse files
committed
undo force
1 parent f71b383 commit e0307d6

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

sync/beta-release-sync-to-staging.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
4343
pushd "isos/${ARCH}" || { echo "${ARCH}: Failed to change directory"; break; }
4444

4545
echo "Symlinking to 'latest' if ISO exists"
46-
test -f "Rocky-${REVISION}-${ARCH}-boot.iso" && ln -sf "Rocky-${REVISION}-${ARCH}-boot.iso" "Rocky-${MAJ}-latest-${ARCH}-boot.iso"
47-
test -f "Rocky-${REVISION}-${ARCH}-dvd.iso" && ln -sf "Rocky-${REVISION}-${ARCH}-dvd.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
48-
test -f "Rocky-${REVISION}-${ARCH}-dvd1.iso" && ln -sf "Rocky-${REVISION}-${ARCH}-dvd1.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
49-
test -f "Rocky-${REVISION}-${ARCH}-minimal.iso" && ln -sf "Rocky-${REVISION}-${ARCH}-minimal.iso" "Rocky-${MAJ}-latest-${ARCH}-minimal.iso"
46+
test -f "Rocky-${REVISION}-${ARCH}-boot.iso" && ln -s "Rocky-${REVISION}-${ARCH}-boot.iso" "Rocky-${MAJ}-latest-${ARCH}-boot.iso"
47+
test -f "Rocky-${REVISION}-${ARCH}-dvd.iso" && ln -s "Rocky-${REVISION}-${ARCH}-dvd.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
48+
test -f "Rocky-${REVISION}-${ARCH}-dvd1.iso" && ln -s "Rocky-${REVISION}-${ARCH}-dvd1.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
49+
test -f "Rocky-${REVISION}-${ARCH}-minimal.iso" && ln -s "Rocky-${REVISION}-${ARCH}-minimal.iso" "Rocky-${MAJ}-latest-${ARCH}-minimal.iso"
5050
echo "(Re)generating manifests"
5151
for file in *.iso; do
5252
xorriso -dev "${file}" --find | tail -n+2 | tr -d "'" | cut -c2- | sort > "${file}.manifest"
@@ -76,7 +76,7 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
7676
echo "${ARCH}: Looking for vagrant names and dropping them"
7777
for x in * ; do if [[ "${x}" =~ "vagrant" ]]; then mv "${x}" $(echo ${x} | sed 's/\.vagrant\..*\(\.box\)/\1/g') ; fi ; done
7878
# Generate "latest" links
79-
for x in * ; do ln -sf "${x}" $(echo "${x}" | sed -E "s/-$REVISION-[0-9]+\.[0-9]+/.latest/g ; s/\.oci//g") ; done
79+
for x in * ; do ln -s "${x}" $(echo "${x}" | sed -E "s/-$REVISION-[0-9]+\.[0-9]+/.latest/g ; s/\.oci//g") ; done
8080
# Cloud checksums
8181
for file in *; do
8282
printf "# %s: %s bytes\n%s\n" \
@@ -98,7 +98,7 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
9898
rmdir iso
9999
test -f CHECKSUM && /bin/rm CHECKSUM
100100
# Generate "latest" links
101-
for x in * ; do ln -sf "${x}" $(echo "${x}" | sed -E "s/${MAJOR}\.${MINOR}/${MAJOR}/g ; s/[0-9]+\.[0-9]+/latest/g") ; done
101+
for x in * ; do ln -s "${x}" $(echo "${x}" | sed -E "s/${MAJOR}\.${MINOR}/${MAJOR}/g ; s/[0-9]+\.[0-9]+/latest/g") ; done
102102
# live checksums
103103
for file in *; do
104104
printf "# %s: %s bytes\n%s\n" \

sync/lh-release-sync-to-staging.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
4343
pushd "isos/${ARCH}" || { echo "${ARCH}: Failed to change directory"; break; }
4444

4545
echo "Symlinking to 'latest' if ISO exists"
46-
test -f "Rocky-${REVISION}-${ARCH}-boot.iso" && ln -sf "Rocky-${REVISION}-${ARCH}-boot.iso" "Rocky-${MAJ}-latest-${ARCH}-boot.iso"
47-
test -f "Rocky-${REVISION}-${ARCH}-dvd.iso" && ln -sf "Rocky-${REVISION}-${ARCH}-dvd.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
48-
test -f "Rocky-${REVISION}-${ARCH}-dvd1.iso" && ln -sf "Rocky-${REVISION}-${ARCH}-dvd1.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
49-
test -f "Rocky-${REVISION}-${ARCH}-minimal.iso" && ln -sf "Rocky-${REVISION}-${ARCH}-minimal.iso" "Rocky-${MAJ}-latest-${ARCH}-minimal.iso"
46+
test -f "Rocky-${REVISION}-${ARCH}-boot.iso" && ln -s "Rocky-${REVISION}-${ARCH}-boot.iso" "Rocky-${MAJ}-latest-${ARCH}-boot.iso"
47+
test -f "Rocky-${REVISION}-${ARCH}-dvd.iso" && ln -s "Rocky-${REVISION}-${ARCH}-dvd.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
48+
test -f "Rocky-${REVISION}-${ARCH}-dvd1.iso" && ln -s "Rocky-${REVISION}-${ARCH}-dvd1.iso" "Rocky-${MAJ}-latest-${ARCH}-dvd.iso"
49+
test -f "Rocky-${REVISION}-${ARCH}-minimal.iso" && ln -s "Rocky-${REVISION}-${ARCH}-minimal.iso" "Rocky-${MAJ}-latest-${ARCH}-minimal.iso"
5050
echo "(Re)generating manifests"
5151
for file in *.iso; do
5252
xorriso -dev "${file}" --find | tail -n+2 | tr -d "'" | cut -c2- | sort > "${file}.manifest"
@@ -76,7 +76,7 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
7676
echo "${ARCH}: Looking for vagrant names and dropping them"
7777
for x in * ; do if [[ "${x}" =~ "vagrant" ]]; then mv "${x}" $(echo ${x} | sed 's/\.vagrant\..*\(\.box\)/\1/g') ; fi ; done
7878
# Generate "latest" links
79-
for x in * ; do ln -sf "${x}" $(echo "${x}" | sed -E "s/-$REVISION-[0-9]+\.[0-9]+/.latest/g ; s/\.oci//g") ; done
79+
for x in * ; do ln -s "${x}" $(echo "${x}" | sed -E "s/-$REVISION-[0-9]+\.[0-9]+/.latest/g ; s/\.oci//g") ; done
8080
# Cloud checksums
8181
for file in *; do
8282
printf "# %s: %s bytes\n%s\n" \
@@ -98,7 +98,7 @@ for COMPOSE in "${NONSIG_COMPOSE[@]}"; do
9898
rmdir iso
9999
test -f CHECKSUM && /bin/rm CHECKSUM
100100
# Generate "latest" links
101-
for x in * ; do ln -sf "${x}" $(echo "${x}" | sed -E "s/${MAJOR}\.${MINOR}/${MAJOR}/g ; s/[0-9]+\.[0-9]+/latest/g") ; done
101+
for x in * ; do ln -s "${x}" $(echo "${x}" | sed -E "s/${MAJOR}\.${MINOR}/${MAJOR}/g ; s/[0-9]+\.[0-9]+/latest/g") ; done
102102
# live checksums
103103
for file in *; do
104104
printf "# %s: %s bytes\n%s\n" \

0 commit comments

Comments
 (0)