Skip to content

Commit

Permalink
try again...
Browse files Browse the repository at this point in the history
  • Loading branch information
jhump committed Jul 27, 2023
1 parent c5dd491 commit 418cfcf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/workflows/windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
# DOWNLOAD_CACHE: 'd:\downloadcache'
PROTOC_ARTIFACT_SUFFIX: win64
PATH_SEP: ;
BIN: 'd:\tmp\bin'
runs-on: windows-latest
strategy:
matrix:
Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SHELL := bash
MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules
MAKEFLAGS += --no-print-directory
BIN := $(abspath .tmp/bin)
BIN ?= $(abspath .tmp/bin)
COPYRIGHT_YEARS := 2020-2023
LICENSE_IGNORE := -e /testdata/
# Set to use a different compiler. For example, `GO=go1.18rc1 make test`.
Expand All @@ -23,7 +23,7 @@ PROTOC_ARTIFACT_VERSION := $(shell echo $(PROTOC_VERSION) | sed -E 's/-rc([0-9]+
PROTOC_DIR ?= $(abspath ./internal/testdata/protoc/$(PROTOC_VERSION))
PROTOC := $(PROTOC_DIR)/bin/protoc

LOWER_UNAME_OS := $(shell echo $UNAME_OS | tr A-Z a-z)
LOWER_UNAME_OS := $(shell echo $(UNAME_OS) | tr A-Z a-z)
ifeq ($(LOWER_UNAME_OS),darwin)
PROTOC_OS := osx
ifeq ($(UNAME_ARCH),arm64)
Expand Down Expand Up @@ -53,8 +53,6 @@ clean: ## Delete intermediate build artifacts

.PHONY: test
test: build ## Run unit tests
uname -s
uname -m
$(GO) test -race -cover ./...

.PHONY: benchmarks
Expand Down
3 changes: 2 additions & 1 deletion internal/protoc.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import (
// path is created by the Makefile, so run `make test` instead of `go test ./...`
// to make sure the path is populated.
//
// The protoc executable is used by some tests
// The protoc executable is used by some tests to verify that the output of
// this repo matches the output of the reference compiler.
func GetProtocPath(rootDir string) (string, error) {
data, err := os.ReadFile(filepath.Join(rootDir, ".protoc_version"))
if err != nil {
Expand Down

0 comments on commit 418cfcf

Please sign in to comment.