From ddef9a3febba9b72baa314d47a6787cf03be1c15 Mon Sep 17 00:00:00 2001 From: Network Service Mesh Bot <60070799+nsmbot@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:19:14 -0500 Subject: [PATCH] Sync files with networkservicemesh/cmd-template (#676) This PR syncs files with https://github.com/networkservicemesh/cmd-template Revision: https://github.com/networkservicemesh/cmd-template/commits/7369b5fd24fe89c8021d5dcf3f5aea3393a64805 commit 7369b5fd24fe89c8021d5dcf3f5aea3393a64805 Author: Nikita Skrynnik <93182827+NikitaSkrynnik@users.noreply.github.com> Date: Tue Apr 23 20:12:10 2024 +0700 Delete check-release-branch job from release workflow (#130) * Delete check-release-branch job from release workflow Signed-off-by: NikitaSkrynnik * minor fixes Signed-off-by: NikitaSkrynnik --------- Signed-off-by: NikitaSkrynnik Signed-off-by: NSMBot Co-authored-by: NSMBot --- .github/workflows/ci.yaml | 5 +++++ .github/workflows/release.yml | 11 +---------- .github/workflows/update-deployments.yaml | 7 +------ 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fb87d166..cbce200e 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 e5959787..8fcf39e9 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 de1d4a1e..5925bed3 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 }}