volker.raschek/dcmerge
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 11 Wiki Activity
347 Commits 1 Branch 21 Tags
5d2102b3452944527ca30bae83d7396f096b151c
Commit Graph
12 Commits
Author SHA1 Message Date
volker.raschek 6bf1f8a314 fix(cmd): adapt error message
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-amd64) (push) Successful in 46s
Details
Run Golang tests / Run unit tests (stable, ubuntu-latest-amd64) (push) Successful in 19s
Details
Lint Markdown files / Run markdown linter (push) Successful in 5s
Details
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-arm64) (push) Successful in 1m47s
Details
Run Golang tests / Run unit tests (stable, ubuntu-latest-arm64) (push) Successful in 58s
Details
2025-12-23 00:10:17 +01:00
volker.raschek c60eb969d0 fix(golangci): add config
Run Golang tests / Run unit tests (stable, ubuntu-latest-amd64) (push) Successful in 6s
Details
Lint Markdown files / Run markdown linter (push) Successful in 3s
Details
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-arm64) (push) Successful in 29s
Details
Run Golang tests / Run unit tests (stable, ubuntu-latest-arm64) (push) Successful in 23s
Details
Lint Golang files / Run golang CI linter (stable, ubuntu-latest-amd64) (push) Successful in 59s
Details
2025-08-12 08:29:38 +02:00
volker.raschek 9705b468fa chore(ci): be golangci-lint compatible
Golang Tests / unittest (push) Successful in 28s
Details
Markdown linter / markdown-lint (push) Successful in 3s
Details
Golang CI lint / golangci (stable, ubuntu-latest-amd64) (push) Successful in 1m49s
Details
Golang CI lint / golangci (stable, ubuntu-latest-arm64) (push) Successful in 2m13s
Details
2025-05-31 23:02:00 +02:00
volker.raschek 967c20c638 fix(cmd): replace deprecated cobra function 2025-03-04 17:50:01 +01:00
volker.raschek 68db80a05a fix(yaml): set indentation to 2 spaces
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details 
The replaced module gopkg.in/yaml.v3 enforce an indentation of 4 spaces, when 0
spaces are defined. This is sad, because the old behavior can not be reproduced.

Instead of using 4 spaces for indentation, when `yamlEncoder.SetIndent(0)` is
called, we call `yamlEncoder.SetIndent(2)` to use 2 spaces for indentation,
because it is closer to 0 instead 4 spaces.
 2025-02-25 16:35:44 +01:00
volker.raschek ab282e5173 feat: support depends_on
continuous-integration/drone/push Build is passing
Details 
This PR supports the extended pattern of `depends_on`. If the short version of
`depends_on` is defined, it will be migrated to the extended version like the
example below:

```yaml
services:
  web:
    depends_on
    - database

services:
  web:
    depends_on:
      database:
        condition: service_started
```

All three types of merging strategies are supported.
 2025-02-24 22:44:11 +01:00
volker.raschek 9b469bd8c6 fix: rename firstWin to existingWin 2023-08-28 11:13:32 +02:00
volker.raschek 4ad9da6d63 fix(cmd): add flag first-win 2023-08-28 10:57:36 +02:00
volker.raschek 3bf9380001 fix(cmd): expect at least one argument
continuous-integration/drone/push Build is passing
Details
2023-07-26 10:43:49 +02:00
volker.raschek f7c1664197 fix(cmd): adapt default output
continuous-integration/drone/push Build is passing
Details
2023-07-26 10:37:56 +02:00
volker.raschek cadf25b089 fix(cmd): rename flag to last-win
continuous-integration/drone/push Build is passing
Details
2023-07-26 10:28:08 +02:00
volker.raschek 3777c49ee9 Initial Commit
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone Build is passing
Details
2023-07-26 09:57:40 +02:00