Skip to content

Commit ddf2921

Browse files
fix tilt by combining the tests
1 parent d2815a8 commit ddf2921

File tree

2 files changed

+15
-56
lines changed

2 files changed

+15
-56
lines changed

.github/workflows/catalogd-tilt.yaml

Lines changed: 0 additions & 45 deletions
This file was deleted.

.github/workflows/tilt.yaml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
name: Tilt
2+
13
on:
24
pull_request:
35
paths:
@@ -9,6 +11,7 @@ on:
911
- 'internal/**'
1012
- 'pkg/**'
1113
- 'Tiltfile'
14+
- 'catalogd/**'
1215
merge_group:
1316

1417
jobs:
@@ -22,16 +25,6 @@ jobs:
2225
- uses: actions/checkout@v4
2326
with:
2427
path: operator-controller
25-
- name: Get catalogd version
26-
id: get-catalogd-version
27-
run: |
28-
cd operator-controller
29-
echo "CATALOGD_VERSION=$(go list -mod=mod -m -f "{{.Version}}" github.com/operator-framework/catalogd)" >> "$GITHUB_OUTPUT"
30-
- uses: actions/checkout@v4
31-
with:
32-
repository: operator-framework/catalogd
33-
path: catalogd
34-
ref: "${{ steps.get-catalogd-version.outputs.CATALOGD_VERSION }}"
3528
- name: Install Go
3629
uses: actions/setup-go@v5
3730
with:
@@ -41,11 +34,22 @@ jobs:
4134
TILT_VERSION="0.33.3"
4235
curl -fsSL https://github.com/tilt-dev/tilt/releases/download/v$TILT_VERSION/tilt.$TILT_VERSION.linux.x86_64.tar.gz | \
4336
tar -xzv -C /usr/local/bin tilt
37+
- name: Install ctlptl
38+
run: |
39+
CTLPTL_VERSION="0.8.20"
40+
curl -fsSL https://github.com/tilt-dev/ctlptl/releases/download/v$CTLPTL_VERSION/ctlptl.$CTLPTL_VERSION.linux.x86_64.tar.gz | \
41+
tar -xzv -C /usr/local/bin ctlptl
42+
- name: Set up kind
43+
run: ctlptl create cluster kind --registry=ctlptl-registry
4444
- name: Set up kind
4545
run: |
4646
cd operator-controller
4747
make kind-cluster
48-
- name: Test Tilt
48+
- name: Test Tilt for Catalogd
49+
run: |
50+
cd operator-controller/catalogd
51+
tilt ci
52+
- name: Test Tilt for Operator Controller
4953
run: |
5054
cd operator-controller
5155
tilt ci

0 commit comments

Comments
 (0)