Conflicts in go.mod, go.sum conflicts can be tedious to fix,
the steps below help setup a custom git mergtool which helps fix those conflicts.
ref: golang/go#32485
Caveats: this is by no means an exhaustive solution.
Conflicts in go.mod, go.sum conflicts can be tedious to fix,
the steps below help setup a custom git mergtool which helps fix those conflicts.
ref: golang/go#32485
Caveats: this is by no means an exhaustive solution.
Also factors in the four principles of modern Release Engineering
| #!/bin/bash | |
| # Have to redirect stderr to stdout here because slave.py uses stderr for output. | |
| ~/bin/slave.py list 2>&1 >/dev/null | grep beaker-slave- | while read slave; do | |
| echo | |
| echo "Checking status of $slave..." | |
| # First, check if we can SSH into the host. If we can, then check the process and maybe shut down. | |
| # This makes sure that we don't consider an SSH failure to be reason to shut down the node. | |
| if ssh $slave echo < /dev/null; then |
| #!/usr/bin/env bash | |
| # repository | |
| cd /tmp | |
| wget http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm | |
| rpm -Uvh epel-release-6-8.noarch.rpm | |
| # system update | |
| yum -y update | |
| yum -y groupinstall "Development Tools" | |
| yum -y install libxslt-devel libyaml-devel libxml2-devel gdbm-devel libffi-devel zlib-devel openssl-devel libyaml-devel readline-devel curl-devel openssl-devel pcre-devel git memcached-devel valgrind-devel mysql-devel ImageMagick-devel ImageMagick |
| #!/usr/bin/env python | |
| # | |
| # Copyright 2012 by Jeff Laughlin Consulting LLC | |
| # | |
| # Permission is hereby granted, free of charge, to any person obtaining a copy | |
| # of this software and associated documentation files (the "Software"), to deal | |
| # in the Software without restriction, including without limitation the rights | |
| # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| # copies of the Software, and to permit persons to whom the Software is | |
| # furnished to do so, subject to the following conditions: |