Sync files with networkservicemesh/cmd-template (#664)

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 <nikita.skrynnik@xored.com> * minor fixes Signed-off-by: NikitaSkrynnik <nikita.skrynnik@xored.com> --------- Signed-off-by: NikitaSkrynnik <nikita.skrynnik@xored.com> Signed-off-by: NSMBot <nsmbot@networkservicmesh.io> Co-authored-by: NSMBot <nsmbot@networkservicmesh.io>
networkservicemesh · May 21, 2024 · 85e8d9b · 85e8d9b
1 parent df27e9f
commit 85e8d9b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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 }}