Skip to content

Commit

Permalink
chore: update protobuf library versions and remove influx_tsm (influx…
Browse files Browse the repository at this point in the history
…data#21882)

* chore: update protobufs

* fix: run codegen during build

* fix: fully remove influx_tsm
  • Loading branch information
lesam committed Jul 20, 2021
1 parent 673dc6a commit 885e8f4
Show file tree
Hide file tree
Showing 60 changed files with 4,585 additions and 6,132 deletions.
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ cmd/influxd/version.go

*.test

influx_tsm
**/influx_tsm
!**/influx_tsm/

influx_stress
**/influx_stress
!**/influx_stress/
Expand Down Expand Up @@ -86,4 +82,4 @@ man/*.1.gz
# 2.0 build artefacts
/chronograf
/http
/ui
/ui
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ v1.8.7 [unreleased]

- [#21749](https://github.com/influxdata/influxdb/pull/21749): fix: rename arm rpms with yum-compatible names
- [#21775](https://github.com/influxdata/influxdb/pull/21775): fix: convert arm arch names for rpms during builds via docker
- [#21891](https://github.com/influxdata/influxdb/pull/21891): chore: update protobuf libraries

v1.8.6 [2021-05-20]
-------------------
Expand Down
27 changes: 14 additions & 13 deletions Dockerfile_build_ubuntu64
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
FROM ubuntu:xenial

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
python-software-properties \
software-properties-common \
wget \
git \
mercurial \
make \
ruby \
ruby-dev \
asciidoc \
autoconf \
libtool \
build-essential \
rpm \
zip \
docbook-xsl \
git \
libtool \
make \
mercurial \
protobuf-compiler \
python \
python-boto \
asciidoc \
python-software-properties \
rpm \
ruby \
ruby-dev \
software-properties-common \
wget \
xmlto \
docbook-xsl
zip

RUN gem install fpm

Expand Down
9 changes: 8 additions & 1 deletion build.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
'influxd' : './cmd/influxd',
'influx_stress' : './cmd/influx_stress',
'influx_inspect' : './cmd/influx_inspect',
'influx_tsm' : './cmd/influx_tsm',
}

supported_builds = {
Expand Down Expand Up @@ -190,6 +189,14 @@ def run_tests(race, parallel, timeout, no_vet, junit=False):
logging.error("Code not formatted. Please use 'go fmt ./...' to fix formatting errors.")
logging.error("{}".format(out))
return False

logging.info("Ensuring codegen is up to date ...")
out = run("./generate.sh")
if len(out) > 0:
logging.error("Please use 'go generate ./...' to regenerate generated code.")
logging.error("{}".format(out))
return False

if not no_vet:
logging.info("Running 'go vet'...")
out = run(go_vet_command)
Expand Down
Loading

0 comments on commit 885e8f4

Please sign in to comment.