Skip to content

Commit f281671

Browse files
authored
Fix go-capturer package name and docker-compose (#33)
* fix: package name change (Issue #31) * fix: docker-compose up -> run (Issue #32 ) * docs: Add how to test via docker-compose
1 parent 8c5b58a commit f281671

File tree

9 files changed

+275
-60
lines changed

9 files changed

+275
-60
lines changed

.github/ABOUT_TESTS.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,26 @@
2424
└── workflows/ ................ Directory for CIs via GitHub Actions.
2525
See: ./workflows/README.md
2626
```
27+
28+
## To test via Docker (docker-compose)
29+
30+
- All-in-one (Go: latest version, Unit Test, Lint check and static analysis)
31+
32+
```bash
33+
docker-compose --file ./.github/docker-compose.yml run mergeability
34+
```
35+
36+
- Unit test on various Go versions
37+
38+
```bash
39+
docker-compose --file ./.github/docker-compose.yml run v1_15
40+
docker-compose --file ./.github/docker-compose.yml run v1_16
41+
docker-compose --file ./.github/docker-compose.yml run v1_17
42+
docker-compose --file ./.github/docker-compose.yml run latest
43+
```
44+
45+
- Check code coverage
46+
47+
```bash
48+
docker-compose --file ./.github/docker-compose.yml run coverage
49+
```

.github/workflows/coverage-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ jobs:
6060
docker save --output ${{ steps.imagetag.outputs.PATH_TAR }}/github_coverage_1.tar github_coverage:latest
6161
6262
- name: Run code coverage
63-
run: docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit coverage
63+
run: docker-compose --file ./.github/docker-compose.yml run coverage
6464

.github/workflows/update-mod-monthly.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ jobs:
3939
run: |
4040
set -eu
4141
: # Check go install functionality
42-
docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit gogetu
43-
docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit goinstall
42+
docker-compose --file ./.github/docker-compose.yml run gogetu
43+
docker-compose --file ./.github/docker-compose.yml run goinstall
4444
: # Check brew functionality
45-
docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit linuxbrew
45+
docker-compose --file ./.github/docker-compose.yml run linuxbrew
4646
4747
- name: Update go.mod and run tests
4848
run: |
4949
set -eu
5050
: # Update go.mod and go.sum
51-
docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit tidy
51+
docker-compose --file ./.github/docker-compose.yml run tidy
5252
: # Check module version compatibility
53-
docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit v1_15
54-
docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit v1_16
55-
docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit v1_17
56-
docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit latest
53+
docker-compose --file ./.github/docker-compose.yml run v1_15
54+
docker-compose --file ./.github/docker-compose.yml run v1_16
55+
docker-compose --file ./.github/docker-compose.yml run v1_17
56+
docker-compose --file ./.github/docker-compose.yml run latest
5757
5858
- name: Create Pull Request on Change
5959
id: cpr

.github/workflows/version-tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ jobs:
7474
docker save --output ${{ steps.imagetag.outputs.PATH_TAR }}/github_mergeability_1.tar github_mergeability:latest
7575
7676
- name: Run tests on Go 1.15
77-
run: docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit v1_15
77+
run: docker-compose --file ./.github/docker-compose.yml run v1_15
7878
- name: Run tests on Go 1.16
79-
run: docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit v1_16
79+
run: docker-compose --file ./.github/docker-compose.yml run v1_16
8080
- name: Run tests on Go 1.17
81-
run: docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit v1_17
81+
run: docker-compose --file ./.github/docker-compose.yml run v1_17
8282
- name: Run tests on latest Go
83-
run: docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit latest
83+
run: docker-compose --file ./.github/docker-compose.yml run latest
8484
- name: Run tests for mergeability
85-
run: docker-compose --file ./.github/docker-compose.yml up --abort-on-container-exit mergeability
85+
run: docker-compose --file ./.github/docker-compose.yml run mergeability

cmd/cmdhello/cmd_hello_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"github.com/KEINOS/Hello-Cobra/cmd/cmdhello"
77
"github.com/KEINOS/Hello-Cobra/cmd/cmdhello/cmdworld"
88
"github.com/KEINOS/Hello-Cobra/cmd/cmdroot"
9-
"github.com/kami-zh/go-capturer"
109
"github.com/stretchr/testify/assert"
1110
"github.com/stretchr/testify/require"
11+
"github.com/zenizh/go-capturer"
1212
)
1313

1414
// ----------------------------------------------------------------------------

cmd/cmdhello/cmdworld/cmd_world_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
"github.com/KEINOS/Hello-Cobra/cmd/cmdhello/cmdworld"
77
"github.com/KEINOS/Hello-Cobra/cmd/cmdroot"
8-
"github.com/kami-zh/go-capturer"
98
"github.com/stretchr/testify/assert"
109
"github.com/stretchr/testify/require"
10+
"github.com/zenizh/go-capturer"
1111
)
1212

1313
// ----------------------------------------------------------------------------

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/KEINOS/Hello-Cobra
33
go 1.15
44

55
require (
6-
github.com/kami-zh/go-capturer v0.0.0-20171211120116-e492ea43421d
7-
github.com/spf13/cobra v1.2.1
6+
github.com/spf13/cobra v1.3.0
87
github.com/stretchr/testify v1.7.0
8+
github.com/zenizh/go-capturer v0.0.0-20211219060012-52ea6c8fed04
99
golang.org/x/mod v0.5.1
1010
)

0 commit comments

Comments
 (0)