mirror of
https://github.com/anchore/syft.git
synced 2026-02-14 19:46:42 +01:00
replace master with main (#128)
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
This commit is contained in:
parent
fa5d2b5d98
commit
a3a3e3848f
4
.github/workflows/acceptance-test.yaml
vendored
4
.github/workflows/acceptance-test.yaml
vendored
@ -1,9 +1,9 @@
|
|||||||
name: 'Acceptance'
|
name: 'Acceptance'
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
# ... only act on pushes to master
|
# ... only act on pushes to main
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
# ... do not act on release tags
|
# ... do not act on release tags
|
||||||
tags-ignore:
|
tags-ignore:
|
||||||
- v*
|
- v*
|
||||||
|
|||||||
10
.github/workflows/release.yaml
vendored
10
.github/workflows/release.yaml
vendored
@ -1,7 +1,7 @@
|
|||||||
name: 'Release'
|
name: 'Release'
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
# take no actions on push...
|
# take no actions on push to any branch...
|
||||||
branches-ignore:
|
branches-ignore:
|
||||||
- '**'
|
- '**'
|
||||||
# ... only act on release tags
|
# ... only act on release tags
|
||||||
@ -16,12 +16,12 @@ jobs:
|
|||||||
|
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
# we don't want to release commits that have been pushed and tagged, but not necessarily merged onto master
|
# we don't want to release commits that have been pushed and tagged, but not necessarily merged onto main
|
||||||
- name: Ensure tagged commit is on master
|
- name: Ensure tagged commit is on main
|
||||||
run: |
|
run: |
|
||||||
echo "Tag: ${GITHUB_REF##*/}"
|
echo "Tag: ${GITHUB_REF##*/}"
|
||||||
git fetch origin master
|
git fetch origin main
|
||||||
git merge-base --is-ancestor ${GITHUB_REF##*/} origin/master && echo "${GITHUB_REF##*/} is a commit on master!"
|
git merge-base --is-ancestor ${GITHUB_REF##*/} origin/main && echo "${GITHUB_REF##*/} is a commit on main!"
|
||||||
|
|
||||||
- name: Check static anaylysis, unit, and integration test results
|
- name: Check static anaylysis, unit, and integration test results
|
||||||
uses: fountainhead/action-wait-for-check@v1.0.0
|
uses: fountainhead/action-wait-for-check@v1.0.0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user