diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3d2bf19..67207b3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,9 +1,7 @@ name: CD on: - workflow_run: - workflows: [CI] - types: [completed] + workflow_call: concurrency: group: cd-alisten @@ -15,13 +13,9 @@ permissions: jobs: deploy: - if: >- - github.event.workflow_run.conclusion == 'success' && - github.event.workflow_run.event == 'push' && - startsWith(github.event.workflow_run.head_branch, 'v') runs-on: ubuntu-latest env: - TAG: ${{ github.event.workflow_run.head_branch }} + TAG: ${{ github.ref_name }} steps: - uses: azure/setup-helm@v5 with: @@ -59,7 +53,7 @@ jobs: shell: bash env: KUBECONFIG: ${{ runner.temp }}/k3s-kubeconfig - HEAD_SHA: ${{ github.event.workflow_run.head_sha }} + HEAD_SHA: ${{ github.sha }} run: | set -euo pipefail diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b782d8..22e31cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,3 +162,12 @@ jobs: repository="$(printf '%s' "${GITHUB_REPOSITORY}" | tr '[:upper:]' '[:lower:]')" printf '%s' "$GITHUB_TOKEN" | helm registry login ghcr.io --username "$GITHUB_ACTOR" --password-stdin helm push "${RUNNER_TEMP}/helm-packages/alisten-${chart_version}.tgz" "oci://ghcr.io/${repository}/charts" + + deploy: + needs: helm-release + if: github.ref_type == 'tag' + uses: ./.github/workflows/cd.yml + secrets: inherit + permissions: + contents: read + packages: read