Skip to content

Commit 02e791c

Browse files
committed
Merge branch 'main' into fix/olm-deployer-2
2 parents d9e3f61 + 76936be commit 02e791c

37 files changed

Lines changed: 5374 additions & 2403 deletions

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
nix/** linguist-generated
22
Cargo.nix linguist-generated
33
crate-hashes.json linguist-generated
4+
extra/crds.yaml linguist-generated

.github/workflows/integration-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ on:
1515
- profile
1616
- custom
1717
test-mode-input:
18-
description: The profile or the runner used
18+
description: |
19+
The profile or the runner used. Eg: `smoke-latest` or `amd64` (see test/interu.yaml)
1920
required: true
2021
test-suite:
2122
description: Name of the test-suite. Only used if test-mode is `custom`

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ result
1313
image.tar
1414

1515
tilt_options.json
16+
local_values.yaml
1617

1718
.direnv/
1819
.direnvrc

0 commit comments

Comments
 (0)