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

Run go generate ./... for CI check #703

Merged
merged 5 commits into from Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/go.yml
Expand Up @@ -118,6 +118,10 @@ jobs:
test-go-build $f $go_file
done

- name: Make sure exampleoc doesn't error or panic
run: go generate ./...
working-directory: go/src/github.com/openconfig/ygot

static_analysis:
name: Static Analysis
runs-on: ubuntu-latest
Expand Down
32 changes: 11 additions & 21 deletions Makefile
@@ -1,30 +1,20 @@
# ygot Makefile
#
# This makefile is used by Travis CI to run tests against the ygot library.
# This makefile is used by GitHub Actions CI to run tests against the ygot library.
#
ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))

test:
go test ./...
generate:
cd ${ROOT_DIR}/demo/getting_started && SRCDIR=${ROOT_DIR} go generate
cd ${ROOT_DIR}/proto/ywrapper && SRCDIR=${ROOT_DIR} go generate
cd $(ROOT_DIR)/proto/yext && SRCDIR=${ROOT_DIR} go generate
cd $(ROOT_DIR)/demo/uncompressed && SRCDIR=${ROOT_DIR} go generate
cd $(ROOT_DIR)/demo/protobuf_getting_started && SRCDIR=${ROOT_DIR} ./update.sh
cd $(ROOT_DIR)/integration_tests/uncompressed && SRCDIR=${ROOT_DIR} go generate
cd $(ROOT_DIR)/integration_tests/annotations/apb && SRCDIR=${ROOT_DIR} go generate
cd $(ROOT_DIR)/integration_tests/annotations/proto2apb && SRCDIR=${ROOT_DIR} go generate
go generate ./demo/getting_started
go generate ./proto/ywrapper
go generate ./proto/yext
go generate ./demo/uncompressed
go generate ./demo/protobuf_getting_started
go generate ./integration_tests/uncompressed
go generate ./integration_tests/annotations/apb
go generate ./integration_tests/annotations/proto2apb
clean:
rm -f ${ROOT_DIR}/demo/getting_started/pkg/ocdemo/oc.go
rm -f ${ROOT_DIR}/demo/uncompressed/pkg/demo/uncompressed.go
deps:
go get -t -d ./ygot
go get -t -d ./ygen
go get -t -d ./generator
go get -t -d ./proto_generator
go get -t -d ./exampleoc
go get -t -d ./ytypes
go get -t -d ./demo/gnmi_telemetry
rm -f demo/getting_started/pkg/ocdemo/oc.go
rm -f demo/uncompressed/pkg/demo/uncompressed.go
install: deps generate
all: clean deps generate test
2 changes: 2 additions & 0 deletions demo/protobuf_getting_started/demo.go
Expand Up @@ -17,6 +17,8 @@
// to generate a Protobuf form of the OpenConfig RIB model.
package main

//go:generate ./update.sh

import (
"fmt"

Expand Down
2 changes: 0 additions & 2 deletions demo/protobuf_getting_started/update.sh
Expand Up @@ -17,8 +17,6 @@ go run ../../proto_generator/protogenerator.go \
-base_import_path="github.com/openconfig/ygot/demo/protobuf_getting_started/ribproto" \
-go_package_base="github.com/openconfig/ygot/demo/protobuf_getting_started/ribproto" \
-path=yang -output_dir=ribproto \
-typedef_enum_with_defmod \
-consistent_union_enum_names \
-enum_package_name=enums -package_name=openconfig \
-exclude_modules=ietf-interfaces \
yang/rib/openconfig-rib-bgp.yang
Expand Down