chore: format using Make (#3257)

ory · Sep 22, 2022 · 15cdb88 · 15cdb88
1 parent be24b80
commit 15cdb88
Show file tree

Hide file tree

Showing 18 changed files with 651 additions and 600 deletions.
diff --git a/.bin/.gitignore b/.bin/.gitignore
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -86,8 +86,6 @@ jobs:
       - run: go list -json > go.list
       - name: Run nancy
         uses: sonatype-nexus-community/nancy-github-action@v1.0.2
-      - name: Run prettier
-        uses: ory/ci/prettier@master
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v2
         env:

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -0,0 +1,17 @@
+name: Format
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.19
+      - run: make format
+      - name: Indicate formatting issues
+        run: git diff HEAD --exit-code --color
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.bin/
 .idea/
 node_modules/
 *.iml

diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,5 @@
 .schema
 .snapshots
+CHANGELOG.md
 spec
 fixtures
diff --git a/Makefile b/Makefile
@@ -5,7 +5,6 @@ export PATH := .bin:${PATH}
 export PWD := $(shell pwd)
 
 GO_DEPENDENCIES = github.com/ory/go-acc \
-				  golang.org/x/tools/cmd/goimports \
 				  github.com/golang/mock/mockgen \
 				  github.com/go-swagger/go-swagger/cmd/swagger \
 				  github.com/go-bindata/go-bindata/go-bindata
@@ -21,8 +20,9 @@ endef
 
 $(foreach dep, $(GO_DEPENDENCIES), $(eval $(call make-go-dependency, $(dep))))
 
-node_modules: package.json
+node_modules: package-lock.json
 		npm ci
+		touch node_modules
 
 .PHONY: .bin/yq
 .bin/yq:
@@ -34,6 +34,9 @@ node_modules: package.json
 docs/cli: .bin/clidoc
 		clidoc .
 
+.bin/goimports: go.sum Makefile
+	GOBIN=$(shell pwd)/.bin go install golang.org/x/tools/cmd/goimports@latest
+
 .bin/ory: Makefile
 		bash <(curl https://raw.githubusercontent.com/ory/meta/master/install.sh) -d -b .bin ory v0.1.22
 		touch -a -m .bin/ory
@@ -89,8 +92,8 @@ quicktest-hsm:
 # Formats the code
 .PHONY: format
 format: .bin/goimports node_modules
-		goimports -w --local github.com/ory .
-		npm run format
+		.bin/goimports -w --local github.com/ory .
+		npm exec -- prettier --write .
 
 # Generates mocks
 .PHONY: mocks
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    .bin/
     .idea/
     node_modules/
     *.iml
@@ Expand Down @@