Skip to content

Commit

Permalink
Merge pull request #75 from JosiahWitt/experiments-rename
Browse files Browse the repository at this point in the history
Rename experiments to experiment
  • Loading branch information
JosiahWitt authored Feb 13, 2023
2 parents e9c6619 + 0dcf330 commit 2e6f290
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ jobs:
strategy:
matrix:
go-version: ["1.16", "1.17", "1.18", "1.19", "1.20"]
path: [".", "cmd/ensure", "experiments/entable"]
path: [".", "cmd/ensure", "experiment/entable"]
include:
- path: "."
flags: package
- path: cmd/ensure
flags: cli
- path: experiments/entable
- path: experiment/entable
flags: entable
exclude:
- path: experiments/entable # Entable requires generics
- path: experiment/entable # Entable requires generics
go-version: "1.16"
- path: experiments/entable # Entable requires generics
- path: experiment/entable # Entable requires generics
go-version: "1.17"

steps:
Expand Down Expand Up @@ -46,11 +46,11 @@ jobs:
strategy:
matrix:
go-version: ["1.16", "1.17", "1.18", "1.19", "1.20"]
path: [".", "cmd/ensure", "experiments/entable"]
path: [".", "cmd/ensure", "experiment/entable"]
exclude:
- path: "experiments/entable" # Entable requires generics
- path: "experiment/entable" # Entable requires generics
go-version: "1.16"
- path: "experiments/entable" # Entable requires generics
- path: "experiment/entable" # Entable requires generics
go-version: "1.17"

steps:
Expand All @@ -76,7 +76,7 @@ jobs:
matrix:
# Staticcheck requires Go 1.19+
go-version: ["1.19", "1.20"]
path: [".", "cmd/ensure", "experiments/entable"]
path: [".", "cmd/ensure", "experiment/entable"]

steps:
- name: Set up Go ${{ matrix.go-version }}
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
generate-mocks:
(cd cmd/ensure; go build -o ../../tmp/ensure) && ./tmp/ensure mocks generate
(cd cmd/ensure; make generate-mocks)
(cd experiments/entable; make generate-mocks)
(cd experiment/entable; make generate-mocks)

test:
go test ./...
(cd cmd/ensure; make test)
(cd experiments/entable; make test)
(cd experiment/entable; make test)

test-coverage:
mkdir -p tmp
go test ./... -coverprofile=tmp/ensure.coverage && go tool cover -html=tmp/ensure.coverage -o=tmp/coverage.html
(cd cmd/ensure; make test-coverage)
(cd experiments/entable; make test-coverage)
(cd experiment/entable; make test-coverage)

lint:
staticcheck ./...
golangci-lint run
(cd cmd/ensure; make lint)
(cd experiments/entable; make lint)
(cd experiment/entable; make lint)
2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ flags:
- "internal/**"
entable:
paths:
- "experiments/entable/**"
- "experiment/entable/**"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/JosiahWitt/ensure"
"github.com/JosiahWitt/ensure/ensuring"
"github.com/JosiahWitt/ensure/experiments/entable"
"github.com/JosiahWitt/ensure/experiment/entable"
)

func TestTRun(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion experiments/entable/go.mod → experiment/entable/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/JosiahWitt/ensure/experiments/entable
module github.com/JosiahWitt/ensure/experiment/entable

go 1.18

Expand Down
File renamed without changes.

0 comments on commit 2e6f290

Please sign in to comment.