Skip to content

Commit

Permalink
Update common CI files to latest version from networkservicemesh/cmd-…
Browse files Browse the repository at this point in the history
…template@master networkservicemesh/cmd-template#8

networkservicemesh/cmd-template PR link: networkservicemesh/cmd-template#8

networkservicemesh/cmd-template commit message:
commit 6af67770640d701812510030fe33d5e0cb73462e
Author: Ed Warnicke <[email protected]>
Date:   Sun Aug 16 10:24:26 2020 -0500

    Merge pull request #8 from denis-tingajkin/simplify_adding_files_to_update_patch

    Simplify adding files to patch

Signed-off-by: NSMBot <[email protected]>
  • Loading branch information
NSMBot committed Aug 16, 2020
1 parent d000590 commit 1b987ce
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ jobs:
run: |
git remote -v
git fetch --depth=1 origin master
- name: NSMBot should update only config files
run: find . -type f ! -name 'go.mod' ! -name 'go.sum' ! -name '*.yaml' ! -name '*.yml' ! -name '*.txt' ! -name '*.md' ! -name '*.conf' -exec git diff --exit-code origin/master -- {} +
- name: Automerge nsmbot PR
uses: ridedott/merge-me-action@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
TAG: master
ORG: networkservicemeshci
CGO_ENABLED: 0
NAME: ${{ github.repository }}
NAME: ${{ github.event.repository.name }}
if: github.repository != 'networkservicemesh/cmd-template'
steps:
- uses: actions/checkout@v1
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/update-cmd-repositories.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
repository: [cmd-registry-proxy-dns, cmd-nsc]
name: Update ${{ matrix.repository }}
runs-on: ubuntu-latest
if: github.repository == 'networkservicemesh/cmd-template'
steps:
- name: Checkout ${{ github.repository }}
uses: actions/checkout@v2
Expand Down Expand Up @@ -52,7 +53,9 @@ jobs:
git config --global user.name "NSMBot"
git remote add cmd_template https://github.com/networkservicemesh/cmd-template.git
git fetch cmd_template
git cherry-pick --no-commit ${GITHUB_SHA}
git diff cmd_template/master -R | git apply
git add $(git ls-tree --name-only -r cmd_template/master | grep ".*\.yml\|.*\.yaml\|.*\.md\|.*\.txt\|.*.\.conf")
git reset -- $(cat exclude.patch.conf)
git commit -s -F /tmp/commit-message
git checkout -b update/${{ github.repository }}
git push -f origin update/${{ github.repository }}
2 changes: 2 additions & 0 deletions exclude.patch.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## Put here paths to files which should be ignored on updating from depended repository
README.md

0 comments on commit 1b987ce

Please sign in to comment.