You've already forked dcmerge
Compare commits
1 Commits
948aa98709
...
96007dc289
Author | SHA1 | Date | |
---|---|---|---|
96007dc289
|
@@ -1,4 +1,4 @@
|
||||
name: "Run Golang tests"
|
||||
name: Golang Tests
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
@@ -6,27 +6,9 @@ on:
|
||||
push:
|
||||
branches: [ '**' ]
|
||||
tags-ignore: [ '**' ]
|
||||
workflow_dispatch: {}
|
||||
|
||||
jobs:
|
||||
# integration-test:
|
||||
# name: "Run integration tests"
|
||||
# runs-on: ${{ matrix.os }}
|
||||
# strategy:
|
||||
# matrix:
|
||||
# go: [ stable ]
|
||||
# os: [ ubuntu-latest-amd64, ubuntu-latest-arm64 ]
|
||||
# steps:
|
||||
# - uses: actions/checkout@v4.3.0
|
||||
# - uses: actions/setup-go@v5.5.0
|
||||
# with:
|
||||
# go-version: ${{ matrix.go }}
|
||||
# - env:
|
||||
# GOPROXY: ${{ vars.GOPROXY }}
|
||||
# run: make test/integration
|
||||
|
||||
unit-test:
|
||||
name: "Run unit tests"
|
||||
unittest:
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
|
@@ -1,4 +1,4 @@
|
||||
name: "Lint Golang files"
|
||||
name: Golang CI lint
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
@@ -6,14 +6,12 @@ on:
|
||||
push:
|
||||
branches: [ '**' ]
|
||||
tags-ignore: [ '**' ]
|
||||
workflow_dispatch: {}
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
golangci:
|
||||
name: "Run golang CI linter"
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
@@ -26,4 +24,4 @@ jobs:
|
||||
go-version: ${{ matrix.go }}
|
||||
- uses: golangci/golangci-lint-action@v8.0.0
|
||||
with:
|
||||
version: v2.3.0 # renovate: datasource=github-releases depName=golangci/golangci-lint
|
||||
version: v2.1
|
@@ -1,4 +1,4 @@
|
||||
name: "Lint Markdown files"
|
||||
name: 'Lint Markdown files'
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
@@ -6,14 +6,13 @@ on:
|
||||
push:
|
||||
branches: [ '*' ]
|
||||
tags-ignore: [ '*' ]
|
||||
workflow_dispatch: {}
|
||||
|
||||
jobs:
|
||||
markdown-lint:
|
||||
name: "Run markdown linter"
|
||||
runs-on: ubuntu-latest
|
||||
runs-on:
|
||||
- ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5.0.0
|
||||
- uses: DavidAnson/markdownlint-cli2-action@v20.0.0
|
||||
with:
|
||||
globs: '**/*.md'
|
||||
globs: '**/*.md'
|
@@ -1,4 +1,4 @@
|
||||
name: "Release"
|
||||
name: Release
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -9,8 +9,8 @@ permissions:
|
||||
|
||||
jobs:
|
||||
release:
|
||||
name: "Release application"
|
||||
runs-on: ubuntu-latest
|
||||
runs-on:
|
||||
- ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5.0.0
|
||||
- uses: docker/setup-qemu-action@v3.6.0
|
||||
@@ -28,11 +28,10 @@ jobs:
|
||||
GOPROXY: ${{ vars.GOPROXY }}
|
||||
uses: goreleaser/goreleaser-action@v6.3.0
|
||||
with:
|
||||
version: v2.11.2 # renovate: datasource=github-releases depName=goreleaser/goreleaser
|
||||
version: "~> v2"
|
||||
args: release --clean
|
||||
|
||||
sync-to-hub-docker-io:
|
||||
name: "Upload Images to docker.io"
|
||||
needs:
|
||||
- release
|
||||
runs-on: ubuntu-latest
|
||||
|
@@ -1,4 +1,4 @@
|
||||
name: "Update Docker Hub Description"
|
||||
name: Update Docker Hub Description
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -8,7 +8,8 @@ on:
|
||||
|
||||
jobs:
|
||||
update-description-on-hub-docker-io:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on:
|
||||
- ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5.0.0
|
||||
- uses: peter-evans/dockerhub-description@v4.0.2
|
||||
@@ -16,4 +17,4 @@ jobs:
|
||||
username: ${{ secrets.DOCKER_IO_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_IO_PASSWORD }}
|
||||
repository: volkerraschek/dcmerge
|
||||
readme-filepath: README.md
|
||||
readme-filepath: README.md
|
@@ -1,13 +0,0 @@
|
||||
version: "2"
|
||||
linters:
|
||||
default: standard
|
||||
enable:
|
||||
- errname
|
||||
- gosec
|
||||
|
||||
exclusions:
|
||||
rules: []
|
||||
warn-unused: true
|
||||
|
||||
run:
|
||||
tests: true
|
@@ -90,13 +90,11 @@ func run(cmd *cobra.Command, args []string) error {
|
||||
|
||||
switch {
|
||||
case len(outputFile) > 0:
|
||||
// #nosec G301
|
||||
err = os.MkdirAll(filepath.Dir(outputFile), 0755)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// #nosec G304
|
||||
f, err := os.Create(outputFile)
|
||||
if err != nil {
|
||||
return err
|
||||
|
@@ -43,7 +43,7 @@ func Fetch(urls ...string) ([]*dockerCompose.Config, error) {
|
||||
return dockerComposeConfigs, nil
|
||||
}
|
||||
|
||||
var ErrPathIsDir error = errors.New("path is a directory")
|
||||
var ErrorPathIsDir error = errors.New("path is a directory")
|
||||
|
||||
func getDockerComposeViaHTTP(url string) (*dockerCompose.Config, error) {
|
||||
req, err := http.NewRequest(http.MethodGet, url, nil)
|
||||
@@ -78,10 +78,9 @@ func readDockerComposeFromFile(name string) (*dockerCompose.Config, error) {
|
||||
case err != nil:
|
||||
return nil, err
|
||||
case fileStat.IsDir():
|
||||
return nil, fmt.Errorf("%w: %s", ErrPathIsDir, name)
|
||||
return nil, fmt.Errorf("%w: %s", ErrorPathIsDir, name)
|
||||
}
|
||||
|
||||
// #nosec G304
|
||||
file, err := os.Open(name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
Reference in New Issue
Block a user