Merge pull request #136 from nhooyr/simplify-root

Simplify root of repository

Author: nhooyr

.circleci/config.yml

@@ -7,15 +7,15 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - go-v3-{{ checksum "go.sum" }}
+            - go-v4-{{ checksum "mod/go.sum" }}
             # Fallback to using the latest cache if no exact match is found.
-            - go-v3-
-      - run: ./ci/fmt.sh
+            - go-v4-
+      - run: ./mod/ci/fmt.sh
       - save_cache:
           paths:
             - /root/gopath
             - /root/.cache/go-build
-          key: go-v3-{{ checksum "go.sum" }}
+          key: go-v4-{{ checksum "mod/go.sum" }}
 
   lint:
     docker:
@@ -24,15 +24,15 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - go-v3-{{ checksum "go.sum" }}
+            - go-v4-{{ checksum "mod/go.sum" }}
             # Fallback to using the latest cache if no exact match is found.
-            - go-v3-
-      - run: ./ci/lint.sh
+            - go-v4-
+      - run: ./mod/ci/lint.sh
       - save_cache:
           paths:
             - /root/gopath
             - /root/.cache/go-build
-          key: go-v3-{{ checksum "go.sum" }}
+          key: go-v4-{{ checksum "mod/go.sum" }}
 
   test:
     docker:
@@ -41,20 +41,20 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - go-v3-{{ checksum "go.sum" }}
+            - go-v4-{{ checksum "mod/go.sum" }}
             # Fallback to using the latest cache if no exact match is found.
-            - go-v3-
-      - run: ./ci/test.sh
+            - go-v4-
+      - run: ./mod/ci/test.sh
       - store_artifacts:
-          path: ci/out
+          path: mod/ci/out
           destination: out
       - save_cache:
           paths:
             - /root/gopath
             - /root/.cache/go-build
-          key: go-v3-{{ checksum "go.sum" }}
+          key: go-v4-{{ checksum "mod/go.sum" }}
       - store_test_results:
-          path: ci/out
+          path: mod/ci/out
 
 workflows:
   version: 2

README.md

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -euox pipefail
 cd "$(dirname "${0}")"
-cd "$(git rev-parse --show-toplevel)"
+cd "$(git rev-parse --show-toplevel)/mod"
 
 gen() {
   # Unfortunately, this is the only way to ensure go.mod and go.sum are correct.
@@ -16,19 +16,19 @@ gen() {
 fmt() {
   gofmt -w -s .
   go run go.coder.com/go-tools/cmd/goimports -w "-local=$(go list -m)" .
-  go run mvdan.cc/sh/cmd/shfmt -i 2 -w -s -sr .
+  go run mvdan.cc/sh/cmd/shfmt -i 2 -w -s -sr ..
   # shellcheck disable=SC2046
   npx prettier \
     --write \
     --print-width 120 \
     --no-semi \
     --trailing-comma all \
     --loglevel silent \
-    $(git ls-files "*.yaml" "*.yml" "*.md")
+    $(git ls-files "../*.yaml" "../*.yml" "../*.md")
 }
 
 unstaged_files() {
-  git ls-files --other --modified --exclude-standard
+  git ls-files --other --modified --exclude-standard ..
 }
 
 check() {