Skip to content

Commit 0e6debf

Browse files
authored
fix: improve workflow dependencies and helm chart publishing (#212)
- Make build depend on test completion (sequential flow) - Remove build-docs dependency from release job - Add missing IMG and CHART_REGISTRY environment variables for helm publishing - Ensure helm charts are properly pushed to ghcr.io/weaveworks/charts
1 parent 30420a9 commit 0e6debf

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ on:
77
pull_request:
88
branches:
99
- main
10-
pull_request_target:
11-
types:
12-
- closed
1310
workflow_dispatch:
1411

1512
env:
@@ -88,6 +85,7 @@ jobs:
8885
8986
build:
9087
runs-on: ubuntu-latest
88+
needs: [test]
9189
permissions:
9290
contents: read # for actions/checkout to fetch code
9391
packages: write # for pushing to ghcr.io
@@ -138,7 +136,7 @@ jobs:
138136

139137
release:
140138
runs-on: ubuntu-latest
141-
needs: [build, test, build-docs, release-please]
139+
needs: [build, test, release-please]
142140
# only run when release-please creates a release
143141
if: needs.release-please.outputs.release_created == 'true'
144142
permissions:
@@ -177,12 +175,15 @@ jobs:
177175
make publish-helm-chart
178176
env:
179177
VERSION: ${{ steps.get_version.outputs.VERSION }}
178+
IMG: ghcr.io/weaveworks/gitopssets-controller:${{ steps.get_version.outputs.VERSION }}
179+
CHART_REGISTRY: ghcr.io/weaveworks/charts
180180

181181
- name: Generate release manifests
182182
run: |
183183
make release
184184
env:
185185
VERSION: ${{ steps.get_version.outputs.VERSION }}
186+
IMG: ghcr.io/weaveworks/gitopssets-controller:${{ steps.get_version.outputs.VERSION }}
186187

187188
- name: Upload release artifacts
188189
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8

0 commit comments

Comments
 (0)