Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Fix broken main #52

Merged
merged 5 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["ubuntu-latest", "windows-latest"]
os: ["ubuntu-latest"]
go: ["1.18.x", "1.19.x"]
include:
- go: 1.19.x
Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ feel free to [start a new discussion](https://github.com/uber-go/cff/discussions
instead and we'll assist you if we can.

## Contributing Code
Before contributing code, please follow [these steps](#new-functionality).

Before contributing code, please follow [these steps](#contributing-ideas).

When your feature is accepted by maintainers, follow these steps:

Expand Down
15 changes: 10 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
export GOBIN = $(shell pwd)/bin
SHELL = /bin/bash

# Cross-platform way to find the directory holding this Makefile.
PROJECT_ROOT = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))

export GOBIN = $(PROJECT_ROOT)/bin
export PATH := $(GOBIN):$(PATH)

MODULES ?= . ./examples ./internal/tests ./tools ./docs
TEST_FLAGS ?= -race

CFF = $(GOBIN)/cff
MOCKGEN = $(GOBIN)/mockgen
STATICCHECK = $(GOBIN)/staticcheck
MDOX = $(GOBIN)/mdox
CFF = bin/cff
MOCKGEN = bin/mockgen
STATICCHECK = bin/staticcheck
MDOX = bin/mdox

# 'make cover' should not run on docs by default.
# We run that separately explicitly on a specific platform.
Expand Down
4 changes: 4 additions & 0 deletions docs/.mdox-validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ validators:
type: 'githubPullsIssues'
- regex: '(^http[s]?:\/\/)(www\.)?(github\.com\/)uber-go\/cff(\/discussions\/)'
type: 'ignore'

# Ignore pkg.go.dev links until release.
- regex: '(^http[s]?:\/\/)(pkg\.)?(go\.dev\/)'
type: 'ignore'
1 change: 0 additions & 1 deletion docs/get-started/flow.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@ Now let's actually make requests to this interface.
fmt.Println(res.Driver, "drove", res.Rider, "who lives in", res.HomeCity)
```


15. Finally, run `go generate` again.
You should see a message similar to the following.

Expand Down