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

feat(influxdb): Backport modules to 1.7.x #17063

Merged
merged 1 commit into from
Apr 22, 2020
Merged

Conversation

ayang64
Copy link
Contributor

@ayang64 ayang64 commented Mar 2, 2020

This PR will backport the modules work done in 1.8 to the 1.7 branch.

This involves removing Gopkg.* files, adding go.mod and go.sum files, and updating the supporting CI/CD configuration and scripts.

Closes: #16901
Closes: #17057

@ayang64 ayang64 changed the base branch from master to 1.7 March 2, 2020 19:33
@ayang64 ayang64 requested a review from dgnorton March 2, 2020 19:33
@ayang64 ayang64 self-assigned this Mar 2, 2020
@ayang64 ayang64 added the 1.x label Mar 2, 2020
@ayang64 ayang64 added this to the 1.7.11 milestone Mar 2, 2020
@sylr
Copy link

sylr commented Mar 5, 2020

I don't believe this should be backported to 1.7 line.

According to semver this kind of change falls into a MINOR change, not a PATCH one.

@ayang64
Copy link
Contributor Author

ayang64 commented Mar 5, 2020

I don't believe this should be backported to 1.7 line.

According to semver this kind of change falls into a MINOR change, not a PATCH one.

so we have a 1.7 branch that the next minor release will likely be based on. 1.7 is the tip of all 1.7.x development so if we release, for example, 1.7.11, we'd like this modules work to land there.

i recognize that this isn't immediately clear.

does this make sense or am i missing something?

@ayang64 ayang64 force-pushed the backport-modules-to-1.7.x branch from b40977a to a0e7d0b Compare April 1, 2020 11:11
go.mod Outdated
@@ -3,108 +3,54 @@ module github.com/influxdata/influxdb
go 1.12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be updated?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

d'oh -- yes, it does.

@ayang64 ayang64 force-pushed the backport-modules-to-1.7.x branch from a0e7d0b to 4d60807 Compare April 1, 2020 13:05
RUN gem install fpm

# setup environment
ENV GO_VERSION 1.12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be updated?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, the name of this file is Dockerfile_build_ubuntu64_go1.12 so I'm not sure if it should be changed here or a new file created??

Copy link
Contributor

@dgnorton dgnorton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ayang64 Looks like this backport introduces Dockerfile_build_ubuntu64_go1.12 . Do we need it in 1.7.x?

@ayang64
Copy link
Contributor Author

ayang64 commented Apr 1, 2020

@ayang64 Looks like this backport introduces Dockerfile_build_ubuntu64_go1.12 . Do we need it in 1.7.x?

I don't think so. The original author isn't around but as far as I can tell, it was there to test go 1.12 before it was released.

I'll delete the file and resubmit the PR.

@ayang64
Copy link
Contributor Author

ayang64 commented Apr 1, 2020

Actually -- if it is okay with you, what I'd like to do is leave it in this branch.

The docker file exists in our master-1.x branch too. I'd like to open a ticket to remove it there and backport the fix to 1.7.x.

Does that sound reasonable?

@dgnorton
Copy link
Contributor

dgnorton commented Apr 1, 2020

I'd say just remove it from this branch so we don't have to bother with a backport to remove it.

@ayang64 ayang64 force-pushed the backport-modules-to-1.7.x branch from 4d60807 to 0353d34 Compare April 1, 2020 18:25
@ayang64 ayang64 merged commit c958f43 into 1.7 Apr 22, 2020
@jacobmarble jacobmarble deleted the backport-modules-to-1.7.x branch January 2, 2024 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants