diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fb87d16..cbce200 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,6 +15,11 @@ jobs: shellcheck: uses: networkservicemesh/.github/.github/workflows/shellcheck.yaml@main + check-env: + uses: networkservicemesh/.github/.github/workflows/env-check.yaml@main + with: + prefix: "NSM_" + golangci-lint: uses: networkservicemesh/.github/.github/workflows/golangci-lint.yaml@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e595978..8fcf39e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,18 +43,9 @@ jobs: secrets: token: ${{ secrets.GITHUB_TOKEN }} - check-branch: - name: Check release branch in deployments-k8s - needs: [get-tag, create-release] - uses: networkservicemesh/.github/.github/workflows/check-release-branch.yaml@main - with: - tag: ${{ needs.get-tag.outputs.tag }} - secrets: - token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} - update-deployments-k8s: name: Update deployments-k8s - needs: [get-tag, check-branch] + needs: [get-tag, create-release] if: ${{ github.repository != 'networkservicemesh/cmd-template' }} uses: networkservicemesh/.github/.github/workflows/release-deployments.yaml@main with: diff --git a/.github/workflows/update-deployments.yaml b/.github/workflows/update-deployments.yaml index de1d4a1..5925bed 100644 --- a/.github/workflows/update-deployments.yaml +++ b/.github/workflows/update-deployments.yaml @@ -4,14 +4,9 @@ on: push: branches: - main - workflow_run: - types: - - completed - workflows: - - 'automerge' jobs: update-deployments-k8s: - if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.event_name == 'push') }} + if: ${{ github.repository != 'networkservicemesh/cmd-template' }} uses: networkservicemesh/.github/.github/workflows/update-deployments.yaml@main secrets: token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }}