Skip to content

Commit bf230a8

Browse files
committed
Fix ci issues
Signed-off-by: Jeremy Alvis <jeremy.alvis@solo.io>
1 parent b5930fc commit bf230a8

2 files changed

Lines changed: 23 additions & 12 deletions

File tree

.github/actions/upgrade-test-setup/action.yaml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: Upgrade Test Setup
22

33
description: >-
4-
Shared prelude for the upgrade-tests and rolling-upgrade-tests jobs: checkout
5-
with full history/tags, resolve the upgrade-from version (with the
6-
prev-stable == adjacent skip), and bring up the build/cluster toolchain.
7-
Exposes the resolved version and skip flag so the caller can gate its test
8-
step.
4+
Shared prelude for the upgrade-tests and rolling-upgrade-tests jobs: resolve
5+
the upgrade-from version (with the prev-stable == adjacent skip) and bring up
6+
the build/cluster toolchain. Exposes the resolved version and skip flag so the
7+
caller can gate its test step. The caller MUST run actions/checkout (with
8+
fetch-depth: 0 + fetch-tags) before this action — a local action is loaded
9+
from the checked-out workspace and the version resolvers need full history.
910
1011
inputs:
1112
upgrade-from:
@@ -29,13 +30,9 @@ outputs:
2930
runs:
3031
using: "composite"
3132
steps:
32-
- name: Checkout repository
33-
uses: actions/checkout@v6
34-
with:
35-
# Full history + tags so the version-resolver scripts can derive the
36-
# target release to upgrade from.
37-
fetch-depth: 0
38-
fetch-tags: true
33+
# The caller must run actions/checkout (fetch-depth: 0 + fetch-tags) before
34+
# this action: a local action is loaded from the checked-out workspace, so
35+
# its files don't exist on the runner until checkout has run.
3936
- name: Resolve upgrade-from version
4037
id: resolve
4138
shell: bash

.github/workflows/ci.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,13 @@ jobs:
173173
# prev-stable: the previous stable line's latest patch (prev-stable-version.sh)
174174
upgrade-from: [adjacent, prev-stable]
175175
steps:
176+
- name: Checkout repository
177+
uses: actions/checkout@v6
178+
with:
179+
# Full history + tags so the version resolvers can derive the
180+
# upgrade-from release, and so the local action below is on disk.
181+
fetch-depth: 0
182+
fetch-tags: true
176183
- name: Prepare upgrade test environment
177184
id: prep
178185
uses: ./.github/actions/upgrade-test-setup
@@ -214,6 +221,13 @@ jobs:
214221
# prev-stable: the previous stable line's latest patch (prev-stable-version.sh)
215222
upgrade-from: [adjacent, prev-stable]
216223
steps:
224+
- name: Checkout repository
225+
uses: actions/checkout@v6
226+
with:
227+
# Full history + tags so the version resolvers can derive the
228+
# upgrade-from release, and so the local action below is on disk.
229+
fetch-depth: 0
230+
fetch-tags: true
217231
- name: Prepare upgrade test environment
218232
id: prep
219233
uses: ./.github/actions/upgrade-test-setup

0 commit comments

Comments
 (0)