Skip to content

Commit

Permalink
Merge branch 'main' into preferred_codec
Browse files Browse the repository at this point in the history
  • Loading branch information
thesyncim authored Nov 14, 2024
2 parents a0f28aa + 5a083ed commit fc1f871
Show file tree
Hide file tree
Showing 6 changed files with 1,046 additions and 415 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ MAKEFLAGS += --no-builtin-rules
MAKEFLAGS += -j$(NPROCS)

CURRENT_VERSION_MAJOR = 1
CURRENT_VERSION_MINOR = 26
CURRENT_VERSION_BUG = 2
CURRENT_VERSION_MINOR = 27
CURRENT_VERSION_BUG = 0

GIT_DESCRIBE := $(shell git describe)
GITHUB_HEAD_REF ?= $(shell git branch --show-current)
Expand Down
12 changes: 5 additions & 7 deletions generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ PB=$REPO/protobuf

export PATH=/opt/.protoc/bin:$PWD/.protoc/bin:$PATH

# In some systems like Mac OS 13.0.1, the realpath defaults to
# the system installed one which does not support flags like
# --relative-path. This results in the scripts erroring out.
# The coreutils installed with Homebrew (as mentioned in README)
# installs GNU realpath which could be available as "grealpath"
# which actually works. Hence, the option to customize REALPATH
REALPATH=${REALPATH:-realpath}
REALPATH=${REALPATH:-$(if [[ "$OSTYPE" == "darwin"* ]]; then echo "grealpath"; else echo "realpath"; fi)}
if ! command -v $REALPATH &> /dev/null; then
echo "$REALPATH command not found. Please install it and try again."
exit 1
fi

GEN_PROFILE=${1:-go}

Expand Down
Loading

0 comments on commit fc1f871

Please sign in to comment.