Skip to content

Commit 6efcf92

Browse files
committed
fix: failing tests and change operator-container to only go if ci works
1 parent 7d4767d commit 6efcf92

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

.github/workflows/operator-container.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@
2828
name: Build and push operator container image
2929

3030
on:
31-
pull_request:
32-
branches:
33-
- main
34-
paths:
35-
- operator/**/*.go
36-
- containers/operator.Dockerfile
37-
- .github/workflows/operator-container.yaml
3831
push:
3932
branches:
4033
- main
@@ -44,6 +37,10 @@ on:
4437
- operator/**/*.go
4538
- containers/operator.Dockerfile
4639
- .github/workflows/operator-container.yaml
40+
workflow_run:
41+
workflows: ["Operator unit and functional tests"]
42+
types:
43+
- completed
4744

4845
# NOTE: we may want to switch to matrix build for multi-platform support if this is taking too long
4946
# https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners

agent/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ test: venv ## Test using hatch, prints coverage and outputs a report to coverage
3939

4040
.PHONY: license-fmt
4141
license-fmt: ## Run add license header to code.
42-
python3 scripts/format_license.py --root-dir . --license-file ../LICENSE
42+
python3 ../scripts/format_license.py --root-dir . --license-file ../LICENSE
4343

4444
.PHONY: fmt
4545
fmt: license-fmt ## Run go fmt against code.

operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ license-check: go-licenses ## Run go-licenses check against code.
122122

123123
.PHONY: license-fmt
124124
license-fmt: ## Run add license header to code.
125-
python3 scripts/format_license.py --root-dir . --license-file ../LICENSE
125+
python3 ../scripts/format_license.py --root-dir . --license-file ../LICENSE
126126

127127
.PHONY: fmt
128128
fmt: license-fmt ## Run go fmt against code.

0 commit comments

Comments
 (0)