Merge branch 'main' into fix/chart-releaser

bcgov · Feb 4, 2024 · 784b550 · 784b550
2 parents 281ebc2 + cfc7689
commit 784b550
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -86,15 +86,12 @@ jobs:
           git config user.email "[email protected]"
       - name: package helm chart
         shell: bash
-        working-directory: charts/${{ github.event.repository.name }}
         run: |
-          helm dependency update
-          helm package --app-version="${{ needs.semantic-release.outputs.tag }}" --version=${{ needs.semantic-release.outputs.tag }} .
+          helm package -u --destination=.cr-release-packages --app-version="${{ needs.semantic-release.outputs.tag }}" --version=${{ needs.semantic-release.outputs.tag }} charts/${{ github.event.repository.name }}
       - name: Run chart-releaser
         uses: helm/[email protected]
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:
           skip_packaging: 'true'
-          package-path: charts/${{ github.event.repository.name }}
 
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
@@ -5,8 +5,6 @@ on:
     types: [closed]
     paths-ignore:
       - '*.md'
-      - '.github/**'
-      - 'charts/**'
 
 concurrency:
   # PR open and close use the same group, allowing only one at a time