Robert Anthony Bellamy rabellamy

Default

Powerlevel10k

Simple Git Workflow For Continuous Delivery

Workflow guidelines:

master branch is always production-ready, deployable, 100% green test suite
New development is done on feature branches, with frequent rebasing onto master
Clean commit history by preferring to rebase instead of merge (git pull is configured to automatically rebase)

Workflow

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

Vagrant Setup

This tutorial guides you through creating your first Vagrant project.

We start with a generic Ubuntu VM, and use the Chef provisioning tool to:

install packages for vim, git
create user accounts, as specified in included JSON config files
install specified user dotfiles (.bashrc, .vimrc, etc) from a git repository

Afterwards, we'll see how easy it is to package our newly provisioned VM

	#!/bin/python
	import random

	# ------------------------------------------------------------------------------
	# Constants
	# ------------------------------------------------------------------------------

	# Moves
	_ = 0
	X = 1

	language: php

	#
	# Important to note, this is the version of PHP used to run this build, not the
	# one used to run your Drupal installation. Ensure compatibility with the Drush
	# and Terminus versions you're using for this build.
	#
	php:
	- 5.3

	#!/usr/bin/env bash

	set -Eeuo pipefail

	VERSION="20200421.1"

	_usage() {
	cat << __EOF
	$0 usage:

	#!/bin/bash

	usage() {
	echo "Usage $0 branchname"
	exit 1
	}

	if [ -z "$1" ]; then
	usage
	fi

	[alias]
	wtf = log --all --graph --pretty=format:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative

	<?php if ($name): ?>
	<h1 class="author" id="author"><?php print $name; ?></h1>
	?php endif; ?>