poikilotherm

Creating a Backport Branch

This guide explains how to create a backport branch from a tag and apply commits from a feature branch—whether it's still open or already merged.

Step 1: Check Out the Tag and Create a Backport Branch

First, check out the tag you want to backport to and create a new branch:

git checkout 

poikilotherm

# feature-branch is a branch of develop-branch (so they are actually comparable)
git log --cherry --clear-decorations --oneline --no-abbrev --reverse remote/feature-branch ^remote/develop-branch | cut -f2 -d" " | git cherry-pick --stdin -n
git commit -m "chore: squash merge of cherry-picked remote/develop-branch"

poikilotherm

#!/bin/bash

set -euo pipefail

IP4=$(curl -sS -f https://api.ipify.org)
IP4_DNS=$(dig +short myhostname.dynv6.net A @dynv6.com)

IP6=$(curl -sS -f https://api64.ipify.org)
IP6_DNS=$(dig +short myhostname.dynv6.net AAAA @dynv6.com)

poikilotherm

{
	"definitions": {},
	"$schema": "http://json-schema.org/draft-07/schema#",
	"_comment_$id": "https://dataverse.org/auth-providers.json",
	"title": "Dataverse Authentication Providers",
	"type": "object",
	"required": [
		"id",
		"type",
		"enabled",

poikilotherm

#metadataBlock	name	dataverseAlias	displayName	blockURI						
	fzj		FZJ Metadata	https://dataverse.org/schema/citation/					
#datasetField	name	title	description	watermark	fieldType	displayOrder	displayFormatadvancedSearchField	allowControlledVocabulary	allowmultiples	facetable	displayoncreate	required	parent	metadatablock_id	termURI
	institute	Institute	The institute.		text	0	:	TRUE	TRUE	TRUE	TRUE	TRUE	TRUE		fzj	
#controlledVocabulary	DatasetField	Value	identifier	displayOrder					
	institute	Test	test	0

poikilotherm

for I in *.pdf
do
qpdf --encrypt '' `pwgen -sny1 32` 256 --accessibility=n --extract=n --print=low --assemble=n --annotate=n --form=n --modify-other=n --modify=none -- "$I" "`basename $I .pdf`.enc.pdf"
done

poikilotherm

# Based on https://github.com/kubernetes/minikube/blob/master/docs/vmdriver-none.md
# See also: https://github.com/LiliC/travis-minikube/blob/master/.travis.yml

sudo yum update -y
sudo yum install -y epel-release
sudo yum install -y htop
sudo yum install -y yum-utils device-mapper-persistent-data lvm2
sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
sudo yum install -y docker-ce docker-ce-cli containerd.io
sudo systemctl start docker

poikilotherm

#!/bin/bash

##
## --exclude takes one pool or a comma seperated list of pools
##
## Example: scrub-all.sh --exclude rpool
## Example: scrub-all.sh --exclude rpool,tank-foo,tank-bar
##

EMAIL_RECIPIENT="[email protected]"

poikilotherm

PRAGMA foreign_keys=OFF;
BEGIN TRANSACTION;
INSERT INTO "users" VALUES(1,'admin','$2y$10$azqlLpQDRv1MOQclyhgVPeFL0Rj6O9YMiiWTXLZMAqYMsQttD3Ypq',1,0,0,NULL,NULL,NULL,NULL,0,NULL);
INSERT INTO "projects" VALUES(1,'Test',1,'',1416299176,0,0,0);
INSERT INTO "columns" VALUES(1,'Backlog',1,1,4);
INSERT INTO "columns" VALUES(2,'Ready',2,1,2);
INSERT INTO "columns" VALUES(3,'Work in progress',3,1,1);
INSERT INTO "columns" VALUES(4,'Done',4,1,0);
INSERT INTO "tasks" VALUES(1,'Test','test #1',1414066449,'yellow',1,1,0,1,1,NULL,0,0,0,1,1414155137,'',NULL,0,0);
INSERT INTO "tasks" VALUES(2,'Test1234','Test',1416299176,'yellow',1,1,0,2,1,NULL,0,0,0,1,1416299176,'',NULL,0,0);