Skip to content

Commit

Permalink
Sync files with networkservicemesh/cmd-template (#165)
Browse files Browse the repository at this point in the history
This PR syncs files with https://github.com/networkservicemesh/cmd-template

Revision: https://github.com/networkservicemesh/cmd-template/commits/53a5c472676275aa3889aba5a67583b8044b0822

commit 53a5c472676275aa3889aba5a67583b8044b0822
Author: Ed Warnicke <hagbard@gmail.com>
Date:   Sat Apr 17 15:57:53 2021 -0500

    Migrate from 'master' default branch to 'main' (#71)

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>

Co-authored-by: NSMBot <nsmbot@networkservicmesh.io>
  • Loading branch information
nsmbot and NSMBot authored Apr 17, 2021
1 parent d450a5b commit 0174a40
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
steps:
- name: Check out the code
uses: actions/checkout@v2
- name: Fetch master
- name: Fetch main
run: |
git remote -v
git fetch --depth=1 origin master
git fetch --depth=1 origin main
- name: Only allow go.mod and go.sum changes
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 -- {} +
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/main -- {} +
- name: Merge PR
uses: ridedott/merge-me-action@master
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: ci
on:
push:
branches:
- master
- main
pull_request:
jobs:
yamllint:
Expand Down Expand Up @@ -135,13 +135,13 @@ jobs:
- name: Run tests
run: docker run --privileged --rm $(docker build -q . --target test)
- name: Find merged PR
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: jwalton/gh-find-current-pr@v1
id: findPr
with:
github-token: ${{ github.token }}
- name: Publish Image
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && success() && steps.findPr.outputs.number
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && success() && steps.findPr.outputs.number
uses: matootie/github-docker@v3.0.0
with:
accessToken: ${{ github.token }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [main]
schedule:
- cron: '0 5 * * 0'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: push
on:
push:
branches:
- master
- main
workflow_run:
types:
- completed
Expand All @@ -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/master') }}
if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.ref == 'refs/heads/main') }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-for-updates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.NSM_BOT_GITHUB_TOKEN }}
BRANCH_PREFIX: "update/"
PULL_REQUEST_BRANCH: "master"
PULL_REQUEST_BRANCH: "main"
6 changes: 3 additions & 3 deletions .github/workflows/update-deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Update deployments-k8s reposiotry
on:
push:
branches:
- master
- main
workflow_run:
types:
- completed
Expand All @@ -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/master') }}
if: ${{ github.repository != 'networkservicemesh/cmd-template' && (github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.ref == 'refs/heads/main') }}
steps:
- name: Checkout ${{ github.repository }}
uses: actions/checkout@v2
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Create commit message
working-directory: ${{ github.repository }}
run: |
echo "Update application version to latest version from ${{ github.repository }}@master ${{ github.repository }}#${{ github.event.number }}" > /tmp/commit-message
echo "Update application version to latest version from ${{ github.repository }}@main ${{ github.repository }}#${{ github.event.number }}" > /tmp/commit-message
echo "" >> /tmp/commit-message
echo "${{ github.repository }} PR link: https://github.com/${{ github.repository }}/pull/${{ github.event.number }}" >> /tmp/commit-message
echo "" >> /tmp/commit-message
Expand Down

0 comments on commit 0174a40

Please sign in to comment.