Skip to content

Commit c598291

Browse files
Unify tilt actions
1 parent c79331d commit c598291

File tree

4 files changed

+16
-61
lines changed

4 files changed

+16
-61
lines changed

.github/workflows/catalogd-tilt.yaml

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

.github/workflows/tilt.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,20 @@ on:
66
- 'api/**'
77
- 'cmd/**'
88
- 'config/**'
9+
- 'catalogd/**'
910
- 'internal/**'
1011
- 'pkg/**'
1112
- 'Tiltfile'
13+
- '.tilt-support'
1214
merge_group:
1315

1416
jobs:
1517
tilt:
1618
runs-on: ubuntu-latest
1719
steps:
18-
- uses: actions/checkout@v4
19-
with:
20-
repository: operator-framework/tilt-support
21-
path: tilt-support
2220
- uses: actions/checkout@v4
2321
with:
2422
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 }}"
3523
- name: Install Go
3624
uses: actions/setup-go@v5
3725
with:
@@ -49,3 +37,15 @@ jobs:
4937
run: |
5038
cd operator-controller
5139
tilt ci
40+
- name: Install ctlptl
41+
run: |
42+
CTLPTL_VERSION="0.8.20"
43+
curl -fsSL https://github.com/tilt-dev/ctlptl/releases/download/v$CTLPTL_VERSION/ctlptl.$CTLPTL_VERSION.linux.x86_64.tar.gz | \
44+
tar -xzv -C /usr/local/bin ctlptl
45+
- name: Set up kind for catalogd
46+
run: |
47+
ctlptl create cluster kind --registry=ctlptl-registry
48+
- name: Test Tilt for catalogd
49+
run: |
50+
cd catalogd
51+
tilt ci

.tilt-support

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,4 @@ def deploy_repo(repo, data, tags="", debug=True):
148148
build_binary(repo, binary, data['deps'], data['image'], tags, debug)
149149
k8s_resource(deployment, port_forwards=['{}:30000'.format(local_port)])
150150
local_port += 1
151-
process_yaml(kustomize(data['yaml']))
151+
process_yaml(kustomize(data['yaml']))

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ catalogd = {
2121
'starting_debug_port': 20000,
2222
}
2323

24-
deploy_repo('catalogd', catalogd, '-tags containers_image_openpgp')
24+
deploy_repo('catalogd', catalogd, '-tags containers_image_openpgp')

0 commit comments

Comments
 (0)