Merge branch 'main' into minor-changes

This commit is contained in:
David Allen 2024-08-22 08:45:45 -06:00 committed by GitHub
commit 39a30d199f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 11 deletions

View file

@ -6,13 +6,11 @@ on:
tags:
- v*
permissions: write-all # Necessary for the generate-build-provenance action with containers
permissions: write-all
jobs:
build:
runs-on: ubuntu-latest
steps:
@ -20,6 +18,12 @@ jobs:
uses: actions/setup-go@v5
with:
go-version: 1.21
- name: Docker Login
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout
uses: actions/checkout@v4
with:

View file

@ -25,10 +25,28 @@ archives:
- CHANGELOG.md
- README.md
- bin/magellan.sh
dockers:
-
image_templates:
- ghcr.io/openchami/{{.ProjectName}}:latest
- ghcr.io/openchami/{{.ProjectName}}:{{ .Tag }}
- ghcr.io/openchami/{{.ProjectName}}:v{{ .Major }}
- ghcr.io/openchami/{{.ProjectName}}:v{{ .Major }}.{{ .Minor }}
build_flag_templates:
- "--pull"
- "--label=org.opencontainers.image.created={{.Date}}"
- "--label=org.opencontainers.image.title={{.ProjectName}}"
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
- "--label=org.opencontainers.image.version={{.Version}}"
extra_files:
- LICENSE
- CHANGELOG.md
- README.md
- bin/magellan.sh
checksum:
name_template: 'checksums.txt'
snapshot:
name_template: "{{ incpatch .Version }}-next"
version_template: "{{ incpatch .Version }}-next"
changelog:
sort: asc
filters:

View file

@ -15,10 +15,6 @@ SCAN_PARAMS=""
COLLECT_PARAMS=""
function build(){
go mod tidy && go build -C bin/magellan
}
function scan() {
# ./magellan scan --subnet 172.16.0.0 --port 443
${EXE} scan ${SCAN_PARAMS}
@ -48,7 +44,7 @@ function collect() {
# parse incoming arguments to set variables
while [[ $# -gt 0 ]]; do
case $1 in
case $1 in
--scan)
SCAN_PARAMS="$2"
shift
@ -107,7 +103,7 @@ while [[ $# -gt 0 ]]; do
ARGS+=("$1") # save positional arg
shift # past argument
;;
esac
esac
done
set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters