5 Commits

Author SHA1 Message Date
112fb76cf5 docs(README): remove badge of drone.io
Some checks failed
Golang Tests / unittest (push) Successful in 45s
Markdown linter / markdown-lint (push) Successful in 10s
Update Docker Hub Description / update-description-on-hub-docker-io (push) Has been cancelled
2025-04-14 19:41:45 +02:00
e2ed63011d feat(ci): sync description on hub.docker.io
All checks were successful
Golang Tests / unittest (push) Successful in 41s
Markdown linter / markdown-lint (push) Successful in 15s
2025-04-14 19:40:28 +02:00
6387e972e3 chore(ci): add golang tests
All checks were successful
Golang Tests / unittest (push) Successful in 42s
Markdown linter / markdown-lint (push) Successful in 12s
2025-04-14 19:29:09 +02:00
5eec7fc1a5 chore(ci): add markdownlinter
All checks were successful
Markdown linter / markdown-lint (push) Successful in 8s
2025-04-14 19:20:12 +02:00
0688315658 chore(ci): remove suffix
All checks were successful
Release / release (push) Successful in 1m52s
Release / sync-container-image (push) Successful in 48s
2025-04-14 19:17:56 +02:00
6 changed files with 81 additions and 12 deletions

View File

@ -0,0 +1,23 @@
name: Golang Tests
on:
pull_request:
types: [ "opened", "reopened", "synchronize" ]
push:
branches:
- '**'
tags-ignore:
- '**'
jobs:
unittest:
runs-on:
- ubuntu-latest
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/setup-go@v5.4.0
with:
go-version: stable
- env:
GOPROXY: ${{ vars.GOPROXY }}
run: make test/unit

View File

@ -0,0 +1,22 @@
name: Markdown linter
on:
pull_request:
types: [ "opened", "reopened", "synchronize" ]
push:
branches:
- '**'
tags-ignore:
- '**'
workflow_dispatch: {}
jobs:
markdown-lint:
container:
image: git.cryptic.systems/volker.raschek/markdownlint:0.44.0
runs-on:
- ubuntu-latest
steps:
- uses: actions/checkout@v4.2.2
- name: Lint Markdown files
run: markdownlint --config .markdownlint.yaml .

View File

@ -31,8 +31,9 @@ jobs:
version: "~> v2" version: "~> v2"
args: release --clean args: release --clean
sync-container-image: sync-to-hub-docker-io:
needs: release needs:
- release
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Copy images to docker.io - name: Copy images to docker.io
@ -47,5 +48,5 @@ jobs:
--dest-username ${{ secrets.DOCKER_IO_USERNAME }} \ --dest-username ${{ secrets.DOCKER_IO_USERNAME }} \
--src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \ --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \
--src-username volker.raschek \ --src-username volker.raschek \
docker://git.cryptic.systems/volker.raschek/dcmerge-goreleaser:${TAG} \ docker://git.cryptic.systems/volker.raschek/dcmerge:${TAG} \
docker://docker.io/volkerraschek/dcmerge-goreleaser:${TAG} docker://docker.io/volkerraschek/dcmerge:${TAG}

View File

@ -0,0 +1,22 @@
name: Update Docker Hub Description
on:
push:
branches:
- master
paths:
- README.md
jobs:
update-description-on-hub-docker-io:
needs:
- sync-container-image
runs-on:
- ubuntu-latest
steps:
- uses: actions/checkout@v4.2.2
- uses: peter-evans/dockerhub-description@v4.0.2
with:
username: ${{ secrets.DOCKER_IO_USERNAME }}
password: ${{ secrets.DOCKER_IO_PASSWORD }}
repository: peterevans/dockerhub-description
readme-filepath: README.md

View File

@ -26,11 +26,7 @@ DCMERGE_IMAGE_UNQUALIFIED=${DCMERGE_IMAGE_NAMESPACE}/${DCMERGE_IMAGE_NAME}:${DCM
# ============================================================================== # ==============================================================================
dcmerge: dcmerge:
CGO_ENABLED=0 \ CGO_ENABLED=0 \
GOPRIVATE=$(shell go env GOPRIVATE) \
GOPROXY=$(shell go env GOPROXY) \ GOPROXY=$(shell go env GOPROXY) \
GONOPROXY=$(shell go env GONOPROXY) \
GONOSUMDB=$(shell go env GONOSUMDB) \
GOSUMDB=$(shell go env GOSUMDB) \
go build -ldflags "-X 'main.version=${VERSION}'" -o ${@} main.go go build -ldflags "-X 'main.version=${VERSION}'" -o ${@} main.go
# CLEAN # CLEAN
@ -43,15 +39,21 @@ clean:
# ============================================================================== # ==============================================================================
PHONY+=test/unit PHONY+=test/unit
test/unit: test/unit:
go test -v -p 1 -coverprofile=coverage.txt -covermode=count -timeout 1200s ./pkg/... CGO_ENABLED=0 \
GOPROXY=$(shell go env GOPROXY) \
go test -v -p 1 -coverprofile=coverage.txt -covermode=count -timeout 1200s ./pkg/...
PHONY+=test/integration PHONY+=test/integration
test/integration: test/integration:
go test -v -p 1 -count=1 -timeout 1200s ./it/... CGO_ENABLED=0 \
GOPROXY=$(shell go env GOPROXY) \
go test -v -p 1 -count=1 -timeout 1200s ./it/...
PHONY+=test/coverage PHONY+=test/coverage
test/coverage: test/unit test/coverage: test/unit
go tool cover -html=coverage.txt CGO_ENABLED=0 \
GOPROXY=$(shell go env GOPROXY) \
go tool cover -html=coverage.txt
# GOLANGCI-LINT # GOLANGCI-LINT
# ============================================================================== # ==============================================================================

View File

@ -1,6 +1,5 @@
# dcmerge # dcmerge
[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/dcmerge/status.svg)](https://drone.cryptic.systems/volker.raschek/dcmerge)
[![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/dcmerge)](https://hub.docker.com/r/volkerraschek/dcmerge) [![Docker Pulls](https://img.shields.io/docker/pulls/volkerraschek/dcmerge)](https://hub.docker.com/r/volkerraschek/dcmerge)
`dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker. `dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker.