Update README.md to point out which branches are in active usage. by qingling128 · Pull Request #75 · Stackdriver/agent-packaging

qingling128 · 2019-11-07T23:09:19Z

No description provided.

igorpeshansky

Some minor comments.

igorpeshansky · 2019-11-07T23:34:50Z

README.md

+
+* Development branches
+
+  All branches with GitHub username as prefixes are development branches.


Not only GitHub usernames, right? Maybe just All branches with username prefixes are development branches.?

igorpeshansky · 2019-11-07T23:35:41Z

README.md

+
+## Branches in Use
+
+* master


[Optional] Use code font for branch names, e.g.:

* `master` ... * `stackdriver-agent-5.5.2` ...

to distinguish them from, e.g., "Development branches" below.

igorpeshansky · 2019-11-07T23:36:46Z

README.md

+
+* test-containers
+
+  We use this branch to store Dockerfiles that are used to build base containers from different distros with necessary dependencies installed so agents can be built in that environment.


[Optional] Split the long line in the markdown source...

igorpeshansky · 2019-11-07T23:39:26Z

README.md

+
+* test-containers
+
+  We use this branch to store Dockerfiles that are used to build base containers from different distros with necessary dependencies installed so agents can be built in that environment.


[Optional] Make Dockerfile code font, e.g.: ...store `Dockerfile`s that are....

igorpeshansky · 2019-11-07T23:40:11Z

README.md

+
+* stackdriver-agent-5.5.2
+
+  We use this branch to build the 5.X.X agent DEB and RPM packages for the Cloud Rapture repos.


[Optional] 5.5.2-X agent DEB and RPM packages...

igorpeshansky · 2019-11-07T23:40:46Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


[Optional] the 5.5.2-X RPM package...

Sorry, still not done, unless I'm missing a commit. I feel it's important to mention so we don't accidentally try to build a 6.0.0 package using those build scripts. WDYT?

Seems like in the last round I only replied Done for places I did not change... This one I'd prefer not to distinguish with finer granularity, as there is no plan to have another branch with 6.0.0 for legacy package. legacy-agent-rpm will be the only one for legacy RPM.

igorpeshansky · 2019-11-07T23:41:16Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


[Optional] Make repo.stackdriver.com code font (here and below).

igorpeshansky · 2019-11-07T23:41:40Z

README.md

+
+* legacy-agent-deb
+
+  We use this branch to build the DEB package for the legacy repo.stackdriver.com repo.


[Optional] the 5.5.2-X DEB package...

Sorry, still not done, unless I'm missing a commit. I feel it's important to mention so we don't accidentally try to build a 6.0.0 package using those build scripts. WDYT?

Seems like in the last round I only replied Done for places I did not change... This one I'd prefer not to distinguish with finer granularity, as there is no plan to have another branch with 6.0.0 for legacy package. legacy-agent-deb will be the only one for legacy DEB.

qingling128

Updated. PTAL.

qingling128 · 2019-11-08T01:52:14Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


qingling128 · 2019-11-08T01:52:20Z

README.md

+
+* legacy-agent-deb
+
+  We use this branch to build the DEB package for the legacy repo.stackdriver.com repo.


qingling128 · 2019-11-08T01:52:30Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


igorpeshansky

Sigh. Just noticed a couple of serious issues. Sorry I didn't see them earlier.

README.md

qingling128 · 2019-11-12T19:42:03Z

Updated. PTAL

igorpeshansky · 2019-11-12T21:55:14Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


igorpeshansky · 2019-11-12T21:55:31Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


igorpeshansky · 2019-11-12T21:55:42Z

README.md

+
+* legacy-agent-deb
+
+  We use this branch to build the DEB package for the legacy repo.stackdriver.com repo.


igorpeshansky · 2019-11-12T21:56:26Z

README.md

+
+* `master`
+
+  We use this branch to build the `6.X.X` agent DEB and RPM packages for the Google Cloud packaging repository repos.


s/packaging/package/ (see https://cloud.google.com/monitoring/agent/#access), and s/repository repos/repository/. Also below.

igorpeshansky · 2019-11-12T22:02:05Z

README.md

+  We use the `build` directory in this branch to store `Dockerfile`s that are used to build containers for reproducible
+  testing of third-party application support.


How about just:

This branch contains `Dockerfile`s for reproducible testing of third-party application support.

?

qingling128 · 2019-11-13T04:57:51Z

Updated. PTAL

igorpeshansky · 2019-11-13T05:04:55Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


Sorry, still not done, unless I'm missing a commit. I feel it's important to mention so we don't accidentally try to build a 6.0.0 package using those build scripts. WDYT?

igorpeshansky · 2019-11-13T05:05:42Z

README.md

+
+* legacy-agent-deb
+
+  We use this branch to build the DEB package for the legacy repo.stackdriver.com repo.


Sorry, still not done, unless I'm missing a commit. I feel it's important to mention so we don't accidentally try to build a 6.0.0 package using those build scripts. WDYT?

qingling128

Updated.

qingling128 · 2019-11-14T00:15:50Z

README.md

+
+## Branches in Use
+
+* master


qingling128 · 2019-11-14T00:15:57Z

README.md

+
+* stackdriver-agent-5.5.2
+
+  We use this branch to build the 5.X.X agent DEB and RPM packages for the Cloud Rapture repos.


qingling128 · 2019-11-14T00:17:53Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


Seems like in the last round I only replied Done for places I did not change... This one I'd prefer not to distinguish with finer granularity, as there is no plan to have another branch with 6.0.0 for legacy package. legacy-agent-rpm will be the only one for legacy RPM.

qingling128 · 2019-11-14T00:18:01Z

README.md

+
+* legacy-agent-rpm
+
+  We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


qingling128 · 2019-11-14T00:18:17Z

README.md

+
+* legacy-agent-deb
+
+  We use this branch to build the DEB package for the legacy repo.stackdriver.com repo.


Seems like in the last round I only replied Done for places I did not change... This one I'd prefer not to distinguish with finer granularity, as there is no plan to have another branch with 6.0.0 for legacy package. legacy-agent-deb will be the only one for legacy DEB.

qingling128 · 2019-11-14T00:18:30Z

README.md

+
+* Development branches
+
+  All branches with GitHub username as prefixes are development branches.


README.md

qingling128 · 2019-11-14T00:19:17Z

README.md

+
+* `master`
+
+  We use this branch to build the `6.X.X` agent DEB and RPM packages for the Google Cloud packaging repository repos.


qingling128 · 2019-11-14T00:19:22Z

README.md

+  We use the `build` directory in this branch to store `Dockerfile`s that are used to build containers for reproducible
+  testing of third-party application support.


igorpeshansky

LGTM

Update README.md to point out which branches are in active usage.

99f293b

qingling128 requested a review from a team November 7, 2019 23:09

ghost requested a review from igorpeshansky November 7, 2019 23:09

googlebot added the cla: yes label Nov 7, 2019

ghost removed their request for review November 7, 2019 23:09

igorpeshansky suggested changes Nov 7, 2019

View reviewed changes

qingling128 added 2 commits November 7, 2019 20:51

minor

cc27461

minor

969bd82

qingling128 commented Nov 8, 2019

View reviewed changes

igorpeshansky suggested changes Nov 8, 2019

View reviewed changes

README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

minor

e55d0a7

igorpeshansky suggested changes Nov 12, 2019

View reviewed changes

minor

27df3b4

igorpeshansky suggested changes Nov 13, 2019

View reviewed changes

qingling128 commented Nov 14, 2019

View reviewed changes

igorpeshansky approved these changes Nov 14, 2019

View reviewed changes

qingling128 merged commit 8c21e63 into stackdriver-agent-5.5.2 Nov 15, 2019

qingling128 deleted the lingshi-readme branch November 15, 2019 20:56


		* Development branches

		All branches with GitHub username as prefixes are development branches.


		* test-containers

		We use this branch to store Dockerfiles that are used to build base containers from different distros with necessary dependencies installed so agents can be built in that environment.


		* stackdriver-agent-5.5.2

		We use this branch to build the 5.X.X agent DEB and RPM packages for the Cloud Rapture repos.


		* legacy-agent-rpm

		We use this branch to build the RPM package for the legacy repo.stackdriver.com repo.


		* legacy-agent-deb

		We use this branch to build the DEB package for the legacy repo.stackdriver.com repo.


		* `master`

		We use this branch to build the `6.X.X` agent DEB and RPM packages for the Google Cloud packaging repository repos.

		We use the `build` directory in this branch to store `Dockerfile`s that are used to build containers for reproducible
		testing of third-party application support.

Conversation

qingling128 commented Nov 7, 2019

Uh oh!

igorpeshansky left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qingling128 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

igorpeshansky left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

qingling128 commented Nov 12, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!