update ci

f2calv · Oct 14, 2023 · e051c6c · e051c6c
1 parent 36074f9
commit e051c6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/build-chart.yml b/.github/workflows/build-chart.yml
@@ -13,17 +13,12 @@ jobs:
  runs-on: ubuntu-latest
  permissions:
  packages: write #for pushing helm package
- contents: write #for creating releases/tags
  env:
  REGISTRY: ghcr.io
  #CHART_REPOSITORY: Note: set dynamically, i.e. github.repository_owner/charts/IMAGE_NAME
  GIT_TAG: ${{ inputs.semVer }}
- HELM_EXPERIMENTAL_OCI: 1
- HELM_VERSION_TO_INSTALL: 3.9.2 #Note: keep this version in sync inside the devcontainer
  steps:
  - uses: actions/checkout@v3
- with:
- fetch-depth: 0 #Note: shallow clone may break git tag & ct lint...
 
  - name: set vars (1 of 3)
  run: |
@@ -35,8 +30,9 @@ jobs:
 
  - name: set vars (3 of 3) #pulls helm version from devcontainer
  run: |
- HELM_VERSION_TO_INSTALL=$(cat .devcontainer/devcontainer.json | jq -r '.features."kubectl-helm-minikube".helm')
+ HELM_VERSION_TO_INSTALL=$(cat .devcontainer/devcontainer.json | jq -r '.features."ghcr.io/devcontainers/features/kubectl-helm-minikube:1".helm')
  echo "HELM_VERSION_TO_INSTALL=$HELM_VERSION_TO_INSTALL" >> $GITHUB_ENV
+ echo $HELM_VERSION_TO_INSTALL
 
  - name: install helm
  uses: azure/setup-helm@v3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
  chart:
  uses: ./.github/workflows/build-chart.yml
  needs: [versioning, app, image]
- if: github.ref == 'refs/heads/main'
+ #if: github.ref == 'refs/heads/main'
  with:
  semVer: ${{ needs.versioning.outputs.semVer }}