Debian-team - Revision history

Martn admin at 15:08, 1 June 2022

2022-06-01T15:08:59Z

← Older revision		Revision as of 15:08, 1 June 2022
Line 203:		Line 203:

	<hr>		<hr>
	Terug naar: [[~~Cfengine~~]]		Terug naar: [[CFEngine]]

Martin: /* Git repositories */

2013-10-08T22:15:56Z

Git repositories

← Older revision		Revision as of 22:15, 8 October 2013
Line 26:		Line 26:
	* PID go to /run/cfengine3. See https://wiki.debian.org/ReleaseGoals/RunDirectory?highlight=%28%2Frun%29#Packages_using_.2Fvar.2Frun_and_.2Fvar.2Flock		* PID go to /run/cfengine3. See https://wiki.debian.org/ReleaseGoals/RunDirectory?highlight=%28%2Frun%29#Packages_using_.2Fvar.2Frun_and_.2Fvar.2Flock
	* The Debian Team prepare for Jessie as our primary target		* The Debian Team prepare for Jessie as our primary target

⚫	== Intermediate repository ==
⚫	The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>
⚫	In the mean time we need an intermediate solution in order to get to a 3.5.2 starting point. The Debian-team have access by LDAP authentication for http.
⚫	* http://packages.webhuis.nl/
⚫	* git://packages.webhuis.nl/cfengine3

	== Starting point ==		== Starting point ==
Line 135:		Line 129:
	</pre>		</pre>
	The push is commented out, it will not pass unless a trick is played. Checkout a branch on the master and then push the master from the client. Switch back to master after the push.		The push is commented out, it will not pass unless a trick is played. Checkout a branch on the master and then push the master from the client. Switch back to master after the push.

		⚫	=== Intermediate repository ===
		⚫	The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>
		⚫	In the mean time we need an intermediate solution in order to get to a 3.5.2 starting point. The Debian-team have access by LDAP authentication for http.
		⚫	* http://packages.webhuis.nl/
		⚫	* git://packages.webhuis.nl/cfengine3

	=== Useful links ===		=== Useful links ===

Martin: /* Decissions made */

2013-10-08T22:14:28Z

Decissions made

← Older revision		Revision as of 22:14, 8 October 2013
Line 25:		Line 25:
	== Decissions made ==		== Decissions made ==
	* PID go to /run/cfengine3. See https://wiki.debian.org/ReleaseGoals/RunDirectory?highlight=%28%2Frun%29#Packages_using_.2Fvar.2Frun_and_.2Fvar.2Flock		* PID go to /run/cfengine3. See https://wiki.debian.org/ReleaseGoals/RunDirectory?highlight=%28%2Frun%29#Packages_using_.2Fvar.2Frun_and_.2Fvar.2Flock
			* The Debian Team prepare for Jessie as our primary target

	== Intermediate repository ==		== Intermediate repository ==
	The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>		The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>

Martin: /* Intermediate repository */

2013-10-08T22:13:14Z

Intermediate repository

← Older revision		Revision as of 22:13, 8 October 2013
Line 23:		Line 23:
	We are tracking our issues here: https://github.com/Webhuis/Cfengine-debian/issues?state=open		We are tracking our issues here: https://github.com/Webhuis/Cfengine-debian/issues?state=open

			== Decissions made ==
			* PID go to /run/cfengine3. See https://wiki.debian.org/ReleaseGoals/RunDirectory?highlight=%28%2Frun%29#Packages_using_.2Fvar.2Frun_and_.2Fvar.2Flock
	== Intermediate repository ==		== Intermediate repository ==
	The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>		The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>

Martin: /* Debian-team repository */

2013-10-08T22:10:13Z

Debian-team repository

← Older revision		Revision as of 22:10, 8 October 2013
Line 21:		Line 21:
	 orig imported 3.5.2 code September 22, 2013		 orig imported 3.5.2 code September 22, 2013
	</pre>		</pre>
			We are tracking our issues here: https://github.com/Webhuis/Cfengine-debian/issues?state=open

	== Intermediate repository ==		== Intermediate repository ==

Martin: /* Debian-team repository */

2013-10-08T22:08:54Z

Debian-team repository

← Older revision		Revision as of 22:08, 8 October 2013
Line 17:		Line 17:
	The Debian-team decided to follow the Debian maintainers'wish that we separate the debian directory from the Cfengine source code and to merge the two branches in a tar ball when a build is required, like this:		The Debian-team decided to follow the Debian maintainers'wish that we separate the debian directory from the Cfengine source code and to merge the two branches in a tar ball when a build is required, like this:
	<pre>		<pre>
	 debian Split debian orig and create NMU branch September 24, 2013		 debian Split debian orig and create NMU branch September 24, 2013
			 masterfiles Moved content masterfiles branch into masterfiles directory in that branch October 1st, 2013
	 orig imported 3.5.2 code September 22, 2013		 orig imported 3.5.2 code September 22, 2013
	</pre>		</pre>

Martin: /* Debian-team repository */

2013-09-25T13:34:03Z

Debian-team repository

← Older revision		Revision as of 13:34, 25 September 2013
Line 14:		Line 14:
	https://github.com/Webhuis/Cfengine-debian/		https://github.com/Webhuis/Cfengine-debian/
	A clone is obtained with:		A clone is obtained with:
	user@host:~$ git clone https://github.com/Webhuis/Cfengine-debian.git		user@host:~$ git clone https://github.com/Webhuis/Cfengine-debian.git
			The Debian-team decided to follow the Debian maintainers'wish that we separate the debian directory from the Cfengine source code and to merge the two branches in a tar ball when a build is required, like this:
			<pre>
			 debian Split debian orig and create NMU branch September 24, 2013
			 orig imported 3.5.2 code September 22, 2013
			</pre>

	== Intermediate repository ==		== Intermediate repository ==
	The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>		The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>

Martin: /* Git repositories */

2013-09-25T13:29:29Z

Git repositories

← Older revision		Revision as of 13:29, 25 September 2013
Line 10:		Line 10:

	We aim at building a current CFengine release for Debian stable, but it would be helpful to the process if we decide to have a testing branch, or daily build branch, as well. We would add newer versions to the Debian repository each time CFengine releases a version we want to Debianize. Having this approach would prevent us to be in the lagging position like we are now.		We aim at building a current CFengine release for Debian stable, but it would be helpful to the process if we decide to have a testing branch, or daily build branch, as well. We would add newer versions to the Debian repository each time CFengine releases a version we want to Debianize. Having this approach would prevent us to be in the lagging position like we are now.
			== Debian-team repository ==
			The Debian-team agree on using a github repository to support our development process. We will develop the github way thus developers create branches themselves and the Debian-team decide on the merge process.
			https://github.com/Webhuis/Cfengine-debian/
			A clone is obtained with:
			user@host:~$ git clone https://github.com/Webhuis/Cfengine-debian.git
	== Intermediate repository ==		== Intermediate repository ==
	The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>		The Debian-team are looking for a way to set up a code review process pre-pushing. The best option is to have a Debian process for this, if not we will work out a flow using github.<br>

Martin: /* Merging NMU */

2013-09-22T21:47:37Z

Merging NMU

← Older revision		Revision as of 21:47, 22 September 2013
Line 117:		Line 117:
	# git push origin master		# git push origin master
	</pre>		</pre>
			The push is commented out, it will not pass unless a trick is played. Checkout a branch on the master and then push the master from the client. Switch back to master after the push.

	=== Useful links ===		=== Useful links ===

Martin: /* 3.2.4-2+NMU1 */

2013-09-22T21:44:26Z

3.2.4-2+NMU1

← Older revision		Revision as of 21:44, 22 September 2013
Line 96:		Line 96:
	* Upload to central repository		* Upload to central repository

			</pre>
			===== Merging NMU =====
			<pre>
			#!/bin/bash

			# Back to master branch

			git checkout master

			# Merge NMU into master

			git merge 3.2.4-2+nmu1

			# Commit the NMU branch

			git commit -am "Merge 3.2.4-2+NMU1 into master"

			# Push the NMU branch

			# git push origin master
	</pre>		</pre>