From 3215ba72a0f894809c11554e755c5eaf00ad7975 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 7 Apr 2022 11:40:28 +0000 Subject: [PATCH] Sync files with networkservicemesh/cmd-template This PR syncs files with https://github.com/networkservicemesh/cmd-template Revision: https://github.com/networkservicemesh/cmd-template/commits/cb98319ae5d1d45e07b0ff3bf7a0e5090adc440a commit cb98319ae5d1d45e07b0ff3bf7a0e5090adc440a Author: Artem Glazychev Date: Thu Apr 7 18:39:13 2022 +0700 Replace github.ref with github.event_name to determine push to the main branch (#99) Signed-off-by: Artem Glazychev Signed-off-by: NSMBot --- .github/workflows/ci.yaml | 2 +- .github/workflows/docker-push-ghcr.yml | 1 + .github/workflows/docker-push.yaml | 2 +- .github/workflows/update-deployments.yaml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b23e259..4fd1408 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -80,7 +80,7 @@ jobs: - uses: actions/checkout@v2 - name: Restrict dependencies on github.com/networkservicemesh/* env: - ALLOWED_REPOSITORIES: "sdk, api, sdk-k8s, sdk-vpp, sdk-sriov" + ALLOWED_REPOSITORIES: "api, sdk, sdk-k8s, sdk-kernel, sdk-sriov, sdk-vpp" run: | for i in $(grep github.com/networkservicemesh/ go.mod | grep -v '^module' | sed 's;.*\(github.com\/networkservicemesh\/[^ ]*\).*;\1;g');do if ! [ "$(echo ${ALLOWED_REPOSITORIES} | grep ${i#github.com/networkservicemesh/})" ]; then diff --git a/.github/workflows/docker-push-ghcr.yml b/.github/workflows/docker-push-ghcr.yml index 9be5c43..a3ac114 100644 --- a/.github/workflows/docker-push-ghcr.yml +++ b/.github/workflows/docker-push-ghcr.yml @@ -12,6 +12,7 @@ on: jobs: docker: runs-on: ubuntu-latest + if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.event_name == 'push') }} steps: - name: "Checkout" uses: actions/checkout@v2 diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml index c6d9738..40693f7 100644 --- a/.github/workflows/docker-push.yaml +++ b/.github/workflows/docker-push.yaml @@ -19,7 +19,7 @@ jobs: ORG: networkservicemeshci CGO_ENABLED: 0 NAME: ${{ github.event.repository.name }} - if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.ref == 'refs/heads/main') }} + if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.event_name == 'push') }} steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v1 diff --git a/.github/workflows/update-deployments.yaml b/.github/workflows/update-deployments.yaml index 05fe3d4..8fad8ba 100644 --- a/.github/workflows/update-deployments.yaml +++ b/.github/workflows/update-deployments.yaml @@ -13,7 +13,7 @@ jobs: update-deployments-k8s: name: Update deployments-k8s runs-on: ubuntu-latest - if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.ref == 'refs/heads/main') }} + if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.event_name == 'push') }} steps: - name: Checkout ${{ github.repository }} uses: actions/checkout@v2