Skip to content

Commit be5aae2

Browse files
authored
chore: fix chart test to use the main branch (#1568)
1 parent 7ca93ae commit be5aae2

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.github/workflows/lint-test.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ jobs:
5656
SYSDIG_AWS_QA_REG_MANAGEMENT_ROLE_ARN: ${{secrets.SYSDIG_AWS_QA_REG_MANAGEMENT_ROLE_ARN}}
5757
SYSDIG_AWS_QA_TARGET_ACCOUNT_ID: ${{secrets.SYSDIG_AWS_QA_TARGET_ACCOUNT_ID}} # cnt QA account
5858
SHOW_USAGE: false
59+
5960
- name: Run chart-testing (lint)
60-
run: ct lint
61+
run: ct lint --target-branch=main
6162

6263
- name: Run chart-testing (list-changed)
6364
id: list-changed
6465
run: |
65-
changed=$(ct list-changed)
66+
changed=$(ct list-changed --target-branch=main)
6667
if [[ -n "$changed" ]]; then
6768
echo "::set-output name=changed::true"
6869
fi
@@ -73,7 +74,7 @@ jobs:
7374
k3s-version: v1.23.9+k3s1
7475

7576
- name: Run chart-testing (install)
76-
run: ct install --upgrade --excluded-charts common,sysdig-stackdriver-bridge,sysdig-mcm-navmenu
77+
run: ct install --upgrade --target-branch=main --excluded-charts common,sysdig-stackdriver-bridge,sysdig-mcm-navmenu
7778

7879

7980
lint-test-fork:
@@ -124,12 +125,12 @@ jobs:
124125
SECURE_AGENT_TOKEN: ${{ secrets.KUBELAB_AGENT_KEY }}
125126

126127
- name: Run chart-testing (lint)
127-
run: ct lint
128+
run: ct lint --target-branch=main
128129

129130
- name: Run chart-testing (list-changed)
130131
id: list-changed
131132
run: |
132-
changed=$(ct list-changed)
133+
changed=$(ct list-changed --target-branch=main)
133134
if [[ -n "$changed" ]]; then
134135
echo "::set-output name=changed::true"
135136
fi
@@ -140,7 +141,7 @@ jobs:
140141
k3s-version: v1.23.9+k3s1
141142

142143
- name: Run chart-testing (install)
143-
run: ct install --upgrade --excluded-charts common,sysdig-stackdriver-bridge,sysdig-mcm-navmenu
144+
run: ct install --upgrade --target-branch=main --excluded-charts common,sysdig-stackdriver-bridge,sysdig-mcm-navmenu
144145

145146
- uses: actions/github-script@v7
146147
id: update-check-run

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ docs: deps-docs
1111

1212
lint:
1313
find . -name "Chart.lock" -type f -delete
14-
docker run --rm -e CT_VALIDATE_MAINTAINERS=false -u $(shell id -u) -v $(PWD):/charts quay.io/helmpack/chart-testing:latest sh -c "cd /charts; ct lint --all"
14+
docker run --rm -e CT_VALIDATE_MAINTAINERS=false -u $(shell id -u) -v $(PWD):/charts quay.io/helmpack/chart-testing:latest sh -c "cd /charts; ct lint --target-branch=main --all"
1515

1616
deps-unittest:
1717
@helm plugin install https://github.com/helm-unittest/helm-unittest --version=0.3.3 || true

0 commit comments

Comments
 (0)