Skip to content

Commit eaec680

Browse files
claudeXeoneid
authored andcommitted
feat: consecutive upgrade pairs, drop curated pair and extra_pairs input
- Replace "every version → latest" with consecutive pairs (v[i] → v[i+1]) - Remove curated v0.25→v0.26 pair logic - Remove extra_pairs workflow_dispatch input
1 parent 2643ae0 commit eaec680

1 file changed

Lines changed: 25 additions & 38 deletions

File tree

‎.github/workflows/upgrade-integration-test.yml‎

Lines changed: 25 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
# Tests that Dokploy can upgrade from version A to version B while keeping
44
# user projects (Postgres, MongoDB, two web apps, one static site) alive.
55
#
6-
# Two modes, combined into a single matrix:
7-
# • Auto: every stable tag >= floor_version → latest stable tag (N jobs)
8-
# • Curated: hand-picked pairs (default: latest v0.25.x → latest v0.26.x)
6+
# Generates consecutive upgrade pairs: each stable tag >= floor_version → next tag.
97
#
108
# Only triggered manually to avoid burning Actions minutes.
119

@@ -15,13 +13,9 @@ on:
1513
workflow_dispatch:
1614
inputs:
1715
floor_version:
18-
description: 'Oldest version tag to include in auto pairs (e.g. v0.29.4)'
16+
description: 'Oldest version tag to include in pairs (e.g. v0.29.4)'
1917
required: false
2018
default: 'v0.29.4'
21-
extra_pairs:
22-
description: 'Extra pairs as JSON, e.g. [{"from":"v0.25.2","to":"v0.26.0"}]'
23-
required: false
24-
default: ''
2519

2620
env:
2721
DOKPLOY_IMAGE: dokploy/dokploy
@@ -43,7 +37,6 @@ jobs:
4337
id: pairs
4438
env:
4539
FLOOR: ${{ inputs.floor_version }}
46-
EXTRA: ${{ inputs.extra_pairs }}
4740
run: |
4841
set -euo pipefail
4942
@@ -54,51 +47,45 @@ jobs:
5447
grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | \
5548
sort -V)
5649
57-
LATEST=$(echo "$ALL_TAGS" | tail -n1)
58-
echo "Latest tag on Docker Hub: $LATEST"
50+
echo "All tags found:"
51+
echo "$ALL_TAGS"
5952
6053
# Floor semver components
6154
FLOOR_CLEAN="${FLOOR#v}"
6255
IFS='.' read -r F_MAJ F_MIN F_PAT <<< "$FLOOR_CLEAN"
6356
64-
# Build "each version >= FLOOR, != LATEST → LATEST" pairs
65-
AUTO_PAIRS=$(echo "$ALL_TAGS" | while read -r TAG; do
66-
[ "$TAG" = "$LATEST" ] && continue
57+
# Filter tags >= FLOOR
58+
FILTERED=$(echo "$ALL_TAGS" | while read -r TAG; do
6759
TAG_CLEAN="${TAG#v}"
6860
IFS='.' read -r T_MAJ T_MIN T_PAT <<< "$TAG_CLEAN"
6961
if [ "$T_MAJ" -gt "$F_MAJ" ] || \
7062
{ [ "$T_MAJ" -eq "$F_MAJ" ] && [ "$T_MIN" -gt "$F_MIN" ]; } || \
7163
{ [ "$T_MAJ" -eq "$F_MAJ" ] && [ "$T_MIN" -eq "$F_MIN" ] && [ "$T_PAT" -ge "$F_PAT" ]; }; then
72-
printf '{"from":"%s","to":"%s"}\n' "$TAG" "$LATEST"
64+
echo "$TAG"
7365
fi
74-
done | jq -sc '.')
75-
76-
# Curated pairs (latest v0.25.x → latest v0.26.x)
77-
# Find the highest v0.25.x and v0.26.x tags from Docker Hub
78-
V25=$(echo "$ALL_TAGS" | grep '^v0\.25\.' | tail -n1)
79-
V26=$(echo "$ALL_TAGS" | grep '^v0\.26\.' | tail -n1)
80-
CURATED='[]'
81-
if [ -n "$V25" ] && [ -n "$V26" ] && [ "$V25" != "$V26" ]; then
82-
CURATED=$(jq -cn --arg f "$V25" --arg t "$V26" '[{"from":$f,"to":$t}]')
83-
fi
66+
done)
8467
85-
EXTRA_JSON="${EXTRA:-[]}"
86-
if [ -z "$EXTRA_JSON" ] || [ "$EXTRA_JSON" = "" ]; then
87-
EXTRA_JSON="[]"
88-
fi
68+
echo "Tags >= $FLOOR:"
69+
echo "$FILTERED"
70+
71+
# Build consecutive pairs: tag[i] → tag[i+1]
72+
TAGS_ARR=()
73+
while IFS= read -r t; do TAGS_ARR+=("$t"); done <<< "$FILTERED"
8974
90-
# Merge all sources, deduplicate by "from+to"
91-
ALL=$(jq -cn \
92-
--argjson auto "$AUTO_PAIRS" \
93-
--argjson curated "$CURATED" \
94-
--argjson extra "$EXTRA_JSON" \
95-
'$auto + $curated + $extra | unique_by(.from + "-" + .to)')
75+
PAIRS='[]'
76+
for (( i=0; i<${#TAGS_ARR[@]}-1; i++ )); do
77+
FROM="${TAGS_ARR[$i]}"
78+
TO="${TAGS_ARR[$i+1]}"
79+
PAIRS=$(echo "$PAIRS" | jq -c \
80+
--arg f "$FROM" --arg t "$TO" \
81+
'. + [{"from":$f,"to":$t}]')
82+
done
9683
97-
COUNT=$(echo "$ALL" | jq 'length')
84+
COUNT=$(echo "$PAIRS" | jq 'length')
9885
echo "Total pairs: $COUNT"
99-
echo "$ALL" | jq -r '.[] | " \(.from) → \(.to)"'
86+
echo "$PAIRS" | jq -r '.[] | " \(.from) → \(.to)"'
10087
101-
echo "pairs=$ALL" >> "$GITHUB_OUTPUT"
88+
echo "pairs=$PAIRS" >> "$GITHUB_OUTPUT"
10289
10390
10491
# ── 2. Run one upgrade test per pair ────────────────────────────────────────

0 commit comments

Comments
 (0)