Skip to content

Commit

Permalink
fix: incorrect makefile rule (#2222)
Browse files Browse the repository at this point in the history
  • Loading branch information
icyphox authored and aeneasr committed Feb 14, 2022
1 parent 41b6f18 commit 83a0ce7
Show file tree
Hide file tree
Showing 5 changed files with 819 additions and 867 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,10 @@ jobs:
- run: go list -json > go.list
- name: Run nancy
uses: sonatype-nexus-community/[email protected]
- run: |
npm install
cd docs; npm install
- run: npm install
name: Install node deps
- name: Run prettier
uses: ory/ci/prettier@master
run: npm run format:check
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v2
env:
Expand Down Expand Up @@ -194,13 +192,14 @@ jobs:
name: logs
path: test/e2e/*.e2e.log


docs-cli:
runs-on: ubuntu-latest
name: Build CLI docs
needs:
- test
steps:
- uses: ory/ci/docs/cli@master
- uses: ory/ci/docs/cli-next@master
with:
token: ${{ secrets.ORY_BOT_PAT }}

Expand Down
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,13 @@ docs/cli:
node_modules: package.json Makefile
npm ci

docs/node_modules: docs/package.json
cd docs; npm ci

.bin/golangci-lint: Makefile
bash <(curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh) -d -b .bin v1.28.3

.bin/hydra: Makefile
bash <(curl https://raw.githubusercontent.com/ory/meta/master/install.sh) -d -b .bin hydra v1.11.0

.PHONY: docs
docs: docs/node_modules
cd docs; npm run build

.PHONY: lint
lint: .bin/golangci-lint
Expand Down Expand Up @@ -130,9 +125,8 @@ quickstart-dev:

# Formats the code
.PHONY: format
format: .bin/goimports docs/node_modules node_modules
format: .bin/goimports node_modules
goimports -w -local github.com/ory .
cd docs; npm run format
npm run format

# Build local docker image
Expand Down
4 changes: 2 additions & 2 deletions go_mod_indirect_pins.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (

_ "github.com/jteeuwen/go-bindata"

_ "github.com/mikefarah/yq/v4"

_ "github.com/davidrjonas/semver-cli"

_ "github.com/cortesi/modd/cmd/modd"
_ "github.com/hashicorp/consul/api"

_ "github.com/mikefarah/yq/v4"
)
Loading

0 comments on commit 83a0ce7

Please sign in to comment.