Skip to content

Commit bbb06a6

Browse files
authored
GH actions from upstream Kargo now pass (#4)
* fix: trigger GitHub Actions on probe branch Signed-off-by: Seth Nickell <snickell@gmail.com> * fix: use workspace path in check-codegen workflow Signed-off-by: Seth Nickell <snickell@gmail.com> * fix: include extended sources in image build Signed-off-by: Seth Nickell <snickell@gmail.com> --------- Signed-off-by: Seth Nickell <snickell@gmail.com>
1 parent aa91f13 commit bbb06a6

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,11 @@ jobs:
216216
- name: Git stuff
217217
# As of go 1.20, this seems to be necessary for invoking git commands
218218
# within the container
219-
run: git config --global --add safe.directory /__w/kargo/kargo
219+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
220220
- name: Run Codegen
221221
run: make codegen
222222
- name: Check nothing has changed
223-
run: git diff --exit-code -- .
223+
run: git -C "$GITHUB_WORKSPACE" diff --exit-code -- .
224224

225225
build-image:
226226
needs: [test-unit, lint-go, lint-charts, lint-proto, lint-and-typecheck-ui, check-codegen]

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
3737
COPY api/ api/
3838
COPY pkg/ pkg/
3939
COPY cmd/ cmd/
40+
COPY extended/ extended/
4041
COPY --from=ui-builder /ui/build pkg/server/ui/
4142

4243
ARG VERSION

extended/docs/UPSTREAM_KARGO_MERGE_PROCEDURE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ upstream-kargo-merge/YYYY-MM-DD
1111

1212
Report path:
1313

14+
1415
```text
1516
extended/docs/upstream-kargo-merge-reports/YYYY-MM-DD.yaml
1617
```

0 commit comments

Comments
 (0)