.gitea/workflows/golang-tests.yaml

@@ -1,21 +0,0 @@
-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

.gitea/workflows/markdown-linters.yaml

@@ -1,20 +0,0 @@
-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 .

.gitea/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    tags: [ '**' ]
+    tags: [ "*" ]
 
 permissions:
   contents: write
@@ -26,14 +26,13 @@ jobs:
         GITEA_TOKEN: ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }}
         GONOSUMDB: ${{ vars.GONOSUMDB }}
         GOPROXY: ${{ vars.GOPROXY }}
-      uses: goreleaser/goreleaser-action@v6.3.0
+      uses: goreleaser/goreleaser-action@v6.2.1
       with:
         version: "~> v2"
         args: release --clean
 
-  sync-to-hub-docker-io:
-    needs:
-    - release
+  sync-container-image:
+    needs: release
     runs-on: ubuntu-latest
     steps:
     - name: Copy images to docker.io
@@ -49,4 +48,4 @@ jobs:
           --src-password ${{ secrets.GIT_CRYPTIC_SYSTEMS_PACKAGE_REGISTRY_TOKEN }} \
           --src-username volker.raschek \
             docker://git.cryptic.systems/volker.raschek/dcmerge:${TAG} \
-            docker://docker.io/volkerraschek/dcmerge:${TAG}
+            docker://docker.io/volkerraschek/dcmerge:${TAG}

.gitea/workflows/update-docker-hub-description.yaml

@@ -1,19 +0,0 @@
-name: Update Docker Hub Description
-
-on:
-  push:
-    branches: [ 'master' ]
-    paths: [ 'README.md' ]
-
-jobs:
-  update-description-on-hub-docker-io:
-    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: volkerraschek/dcmerge
-        readme-filepath: README.md

Makefile

@@ -26,7 +26,11 @@ DCMERGE_IMAGE_UNQUALIFIED=${DCMERGE_IMAGE_NAMESPACE}/${DCMERGE_IMAGE_NAME}:${DCM
 # ==============================================================================
 dcmerge:
 	CGO_ENABLED=0 \
+	GOPRIVATE=$(shell go env GOPRIVATE) \
 	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
 
 # CLEAN
@@ -39,21 +43,15 @@ clean:
 # ==============================================================================
 PHONY+=test/unit
 test/unit:
-	CGO_ENABLED=0 \
-	GOPROXY=$(shell go env GOPROXY) \
-		go test -v -p 1 -coverprofile=coverage.txt -covermode=count -timeout 1200s ./pkg/...
+	go test -v -p 1 -coverprofile=coverage.txt -covermode=count -timeout 1200s ./pkg/...
 
 PHONY+=test/integration
 test/integration:
-	CGO_ENABLED=0 \
-	GOPROXY=$(shell go env GOPROXY) \
-		go test -v -p 1 -count=1 -timeout 1200s ./it/...
+	go test -v -p 1 -count=1 -timeout 1200s ./it/...
 
 PHONY+=test/coverage
 test/coverage: test/unit
-	CGO_ENABLED=0 \
-	GOPROXY=$(shell go env GOPROXY) \
-		go tool cover -html=coverage.txt
+	go tool cover -html=coverage.txt
 
 # GOLANGCI-LINT
 # ==============================================================================

README.md

@@ -1,5 +1,6 @@
 # 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)
 
 `dcmerge` is a small program to merge docker-compose files from multiple sources. It is available via RPM and docker.