Skip to content

Commit 3e4e409

Browse files
committed
Move everything back to the root
The boys in the office hated it. Highly unfortunate but makes sense as it seems confusing.
1 parent 3ca22b5 commit 3e4e409

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+36
-43
lines changed

.circleci/config.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jobs:
77
- checkout
88
- restore_cache:
99
keys:
10-
- go-v4-{{ checksum "mod/go.sum" }}
10+
- go-v4-{{ checksum "go.sum" }}
1111
# Fallback to using the latest cache if no exact match is found.
1212
- go-v4-
13-
- run: ./mod/ci/fmt.sh
13+
- run: ./ci/fmt.sh
1414
- save_cache:
1515
paths:
1616
- /root/gopath
1717
- /root/.cache/go-build
18-
key: go-v4-{{ checksum "mod/go.sum" }}
18+
key: go-v4-{{ checksum "go.sum" }}
1919

2020
lint:
2121
docker:
@@ -24,15 +24,15 @@ jobs:
2424
- checkout
2525
- restore_cache:
2626
keys:
27-
- go-v4-{{ checksum "mod/go.sum" }}
27+
- go-v4-{{ checksum "go.sum" }}
2828
# Fallback to using the latest cache if no exact match is found.
2929
- go-v4-
30-
- run: ./mod/ci/lint.sh
30+
- run: ./ci/lint.sh
3131
- save_cache:
3232
paths:
3333
- /root/gopath
3434
- /root/.cache/go-build
35-
key: go-v4-{{ checksum "mod/go.sum" }}
35+
key: go-v4-{{ checksum "go.sum" }}
3636

3737
test:
3838
docker:
@@ -41,20 +41,20 @@ jobs:
4141
- checkout
4242
- restore_cache:
4343
keys:
44-
- go-v4-{{ checksum "mod/go.sum" }}
44+
- go-v4-{{ checksum "go.sum" }}
4545
# Fallback to using the latest cache if no exact match is found.
4646
- go-v4-
47-
- run: ./mod/ci/test.sh
47+
- run: ./ci/test.sh
4848
- store_artifacts:
49-
path: mod/ci/out
49+
path: ci/out
5050
destination: out
5151
- save_cache:
5252
paths:
5353
- /root/gopath
5454
- /root/.cache/go-build
55-
key: go-v4-{{ checksum "mod/go.sum" }}
55+
key: go-v4-{{ checksum "go.sum" }}
5656
- store_test_results:
57-
path: mod/ci/out
57+
path: ci/out
5858

5959
workflows:
6060
version: 2

.github/CONTRIBUTING.md

Lines changed: 9 additions & 14 deletions

README.md

Lines changed: 1 addition & 1 deletion

mod/accept.go renamed to accept.go

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

mod/ci/fmt.sh renamed to ci/fmt.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

3-
set -euox pipefail
3+
set -euo pipefail
44
cd "$(dirname "${0}")"
5-
cd "$(git rev-parse --show-toplevel)/mod"
5+
cd "$(git rev-parse --show-toplevel)"
66

77
gen() {
88
# Unfortunately, this is the only way to ensure go.mod and go.sum are correct.
@@ -24,11 +24,11 @@ fmt() {
2424
--no-semi \
2525
--trailing-comma all \
2626
--loglevel silent \
27-
$(git ls-files "../*.yaml" "../*.yml" "../*.md")
27+
$(git ls-files "*.yaml" "*.yml" "*.md")
2828
}
2929

3030
unstaged_files() {
31-
git ls-files --other --modified --exclude-standard ..
31+
git ls-files --other --modified --exclude-standard
3232
}
3333

3434
check() {
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)