Stops the production upload when a pass fails
Each pass is now its own lftp session with a marker in the log, so a failed asset pass stops the script before any HTML goes up. The test checks those markers instead of lftp's output format. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -33,30 +33,39 @@ case "$pass" in
|
||||
esac
|
||||
wants() { [ "$pass" = all ] || [ "$pass" = "$1" ]; }
|
||||
|
||||
commands="set ftp:ssl-force true; set ftp:ssl-protect-data true; set net:max-retries 3;"
|
||||
settings="set ftp:ssl-force true; set ftp:ssl-protect-data true; set net:max-retries 3;"
|
||||
|
||||
# Elke opdracht krijgt een eigen lftp-sessie, zodat het script bij een mislukte
|
||||
# ronde stopt (set -e) voordat de volgende ronde begint: de HTML gaat nooit
|
||||
# omhoog na een mislukte asset-ronde (FR-PR-18).
|
||||
run_lftp() {
|
||||
local commands="$settings $1 quit"
|
||||
if [ -n "${LFTP_OPEN:-}" ]; then
|
||||
lftp -e "$commands" "$LFTP_OPEN"
|
||||
else
|
||||
: "${FTP_HOST:?FTP_HOST ontbreekt}" "${FTP_USER:?FTP_USER ontbreekt}"
|
||||
: "${LFTP_PASSWORD:?LFTP_PASSWORD ontbreekt}"
|
||||
lftp --env-password -u "$FTP_USER" "$FTP_HOST" -e "$commands"
|
||||
fi
|
||||
}
|
||||
|
||||
# Ronde 1: alles behalve HTML en web.config, dus ook /assets. Nieuwe
|
||||
# bestanden met hash in de naam storen de oude release niet.
|
||||
if wants 1; then
|
||||
commands="$commands mirror --reverse --verbose --exclude-glob '*.html' --exclude-glob web.config $dist/ $remote/;"
|
||||
echo "== Ronde 1: alles behalve HTML en web.config"
|
||||
run_lftp "mirror --reverse --verbose --exclude-glob '*.html' --exclude-glob web.config $dist/ $remote/;"
|
||||
fi
|
||||
# Ronde 2: web.config vlak voor de HTML (de regels passen bij de nieuwe
|
||||
# bestanden), dan alle HTML, ook de geneste pagina's en 404.html. Pas nu
|
||||
# verwijst iets naar de nieuwe assets.
|
||||
if wants 2; then
|
||||
commands="$commands put -O $remote $dist/web.config;"
|
||||
commands="$commands mirror --reverse --verbose --include-glob '*.html' $dist/ $remote/;"
|
||||
echo "== Ronde 2: web.config en alle HTML"
|
||||
run_lftp "put -O $remote $dist/web.config;"
|
||||
run_lftp "mirror --reverse --verbose --include-glob '*.html' $dist/ $remote/;"
|
||||
fi
|
||||
# Ronde 3: opruimen als laatste, zodat bezoekers met de oude HTML hun oude
|
||||
# assets nog vinden tot de nieuwe HTML helemaal staat.
|
||||
if wants 3; then
|
||||
commands="$commands mirror --reverse --delete --verbose $dist/ $remote/;"
|
||||
fi
|
||||
commands="$commands quit"
|
||||
|
||||
if [ -n "${LFTP_OPEN:-}" ]; then
|
||||
lftp -e "$commands" "$LFTP_OPEN"
|
||||
else
|
||||
: "${FTP_HOST:?FTP_HOST ontbreekt}" "${FTP_USER:?FTP_USER ontbreekt}"
|
||||
: "${LFTP_PASSWORD:?LFTP_PASSWORD ontbreekt}"
|
||||
lftp --env-password -u "$FTP_USER" "$FTP_HOST" -e "$commands"
|
||||
echo "== Ronde 3: oude bestanden opruimen"
|
||||
run_lftp "mirror --reverse --delete --verbose $dist/ $remote/;"
|
||||
fi
|
||||
|
||||
@@ -496,19 +496,17 @@ describe.skipIf(toolsMissing || lftpMissing)('upload-production.sh', () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it('zet alle assets vóór de eerste HTML (FR-PR-18) en de web.config vóór de HTML', async () => {
|
||||
it('doet de rondes in volgorde en eindigt met de volledige boom (FR-PR-18)', async () => {
|
||||
const { dist, target } = await setup();
|
||||
const run = await upload(dist, target);
|
||||
expect(run.code).toBe(0);
|
||||
|
||||
const lines = run.stdout.split('\n');
|
||||
const at = (needle: string) =>
|
||||
lines.findIndex((line) => line.includes(needle));
|
||||
const firstHtml = lines.findIndex((line) => /\.html/.test(line));
|
||||
expect(at('assets/a.js')).toBeGreaterThanOrEqual(0);
|
||||
expect(at('assets/a.js')).toBeLessThan(firstHtml);
|
||||
expect(at('web.config')).toBeGreaterThanOrEqual(0);
|
||||
expect(at('web.config')).toBeLessThan(firstHtml);
|
||||
// De volgorde zelf volgt uit de rondes hierboven (na ronde 1 staat er
|
||||
// nog geen HTML); hier alleen dat het script ze in die volgorde doet
|
||||
const rounds = [...run.stdout.matchAll(/^== Ronde (d)/gm)].map(
|
||||
(match) => match[1],
|
||||
);
|
||||
expect(rounds).toEqual(['1', '2', '3']);
|
||||
|
||||
const expected = [...validFiles, 'web.config'].sort();
|
||||
expect(await tree(target)).toEqual(expected);
|
||||
|
||||
Reference in New Issue
Block a user