Skip to content

Commit

Permalink
fix: call GNUMakefile "generate-sources" target instead
Browse files Browse the repository at this point in the history
This also does a better job at mounting the root directory
in the docker container.
  • Loading branch information
bnpfeife committed Sep 2, 2022
1 parent d6311d4 commit c7bd470
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions releng/protoc-gen
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ set -o errexit \
touch /tmp/timestamp
git config --global --add safe.directory /project
pushd /project
go generate ./...
make generate-sources
# If the previous command generated a new file, it will have "root:root"
# ownership. This becomes an annoyance to work with (i.e git complains
Expand All @@ -43,5 +45,5 @@ go generate ./...
find . -newer /tmp/timestamp -exec chown -v "${USER_UID}:${USER_GID}" "{}" \\\;
EOF

sudo docker run --rm -it -v "$(pwd):/project" "quay.io/influxdb/cross-builder:${CROSS_BUILDER_VERSION}" bash -c "${DOCKERSCRIPT}"
sudo docker run --rm -it -v "${ROOT}:/project" "quay.io/influxdb/cross-builder:${CROSS_BUILDER_VERSION}" bash -c "${DOCKERSCRIPT}"

0 comments on commit c7bd470

Please sign in to comment.