Merge branch 'master' into improve-conn-log

Author: timvaillancourt

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,7 +11,7 @@ Related issue: https://github.com/github/gh-ost/issues/0123456789
 
 ### Description
 
-This PR [briefly explain what is does]
+This PR [briefly explain what it does]
 
 > In case this PR introduced Go code changes:
 

.github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on: [pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Go 1.15
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.15
+
+    - name: Build
+      run: script/cibuild
+
+    - name: Upload gh-ost binary artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: gh-ost
+        path: bin/gh-ost

.github/workflows/replica-tests.yml

@@ -0,0 +1,19 @@
+name: migration tests
+
+on: [pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Go 1.14
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.14
+
+    - name: migration tests
+      run:  script/cibuild-gh-ost-replica-tests

.gitignore

@@ -2,3 +2,4 @@
 /bin/
 /libexec/
 /.vendor/
+.idea/

.travis.yml

@@ -0,0 +1,22 @@
+#
+
+FROM golang:1.15.6
+
+RUN apt-get update
+RUN apt-get install -y ruby ruby-dev rubygems build-essential
+RUN gem install --no-ri --no-rdoc fpm
+ENV GOPATH=/tmp/go
+
+RUN apt-get install -y curl
+RUN apt-get install -y rsync
+RUN apt-get install -y gcc
+RUN apt-get install -y g++
+RUN apt-get install -y bash
+RUN apt-get install -y git
+RUN apt-get install -y tar
+RUN apt-get install -y rpm
+
+RUN mkdir -p $GOPATH/src/github.com/github/gh-ost
+WORKDIR $GOPATH/src/github.com/github/gh-ost
+COPY . .
+RUN bash build.sh

Dockerfile.packaging

@@ -0,0 +1,11 @@
+FROM golang:1.15.6
+LABEL maintainer="[email protected]"
+
+RUN apt-get update
+RUN apt-get install -y lsb-release
+RUN rm -rf /var/lib/apt/lists/*
+
+COPY . /go/src/github.com/github/gh-ost
+WORKDIR /go/src/github.com/github/gh-ost
+
+CMD ["script/test"]

Dockerfile.test

@@ -65,6 +65,7 @@ Also see:
 - [the fine print](doc/the-fine-print.md)
 - [Community questions](https://github.com/github/gh-ost/issues?q=label%3Aquestion)
 - [Using `gh-ost` on AWS RDS](doc/rds.md)
+- [Using `gh-ost` on Azure Database for MySQL](doc/azure.md)
 
 ## What's in a name?
 
@@ -94,7 +95,7 @@ Please see [Coding gh-ost](doc/coding-ghost.md) for a guide to getting started d
 
 [Download latest release here](https://github.com/github/gh-ost/releases/latest)
 
-`gh-ost` is a Go project; it is built with Go `1.8` (though `1.7` should work as well). To build on your own, use either:
+`gh-ost` is a Go project; it is built with Go `1.14` and above. To build on your own, use either:
 - [script/build](https://github.com/github/gh-ost/blob/master/script/build) - this is the same build script used by CI hence the authoritative; artifact is `./bin/gh-ost` binary.
 - [build.sh](https://github.com/github/gh-ost/blob/master/build.sh) for building `tar.gz` artifacts in `/tmp/gh-ost`
 
@@ -107,3 +108,6 @@ Generally speaking, `master` branch is stable, but only [releases](https://githu
 - [@ggunson](https://github.com/ggunson)
 - [@tomkrouper](https://github.com/tomkrouper)
 - [@shlomi-noach](https://github.com/shlomi-noach)
+- [@jessbreckenridge](https://github.com/jessbreckenridge)
+- [@gtowey](https://github.com/gtowey)
+- [@timvaillancourt](https://github.com/timvaillancourt)

README.md

@@ -1 +1 @@
-1.0.42
+1.1.0

RELEASE_VERSION

@@ -2,36 +2,70 @@
 #
 #
 
-RELEASE_VERSION=$(cat RELEASE_VERSION)
+RELEASE_VERSION=
+buildpath=
+
+function setuptree() {
+  b=$( mktemp -d $buildpath/gh-ostXXXXXX ) || return 1
+  mkdir -p $b/gh-ost
+  mkdir -p $b/gh-ost/usr/bin
+  echo $b
+}
 
 function build {
-    osname=$1
-    osshort=$2
-    GOOS=$3
-    GOARCH=$4
-
-    echo "Building ${osname} binary"
-    export GOOS
-    export GOARCH
-    go build -ldflags "$ldflags" -o $buildpath/$target go/cmd/gh-ost/main.go
-
-    if [ $? -ne 0 ]; then
-        echo "Build failed for ${osname}"
-        exit 1
-    fi
-
-    (cd $buildpath && tar cfz ./gh-ost-binary-${osshort}-${timestamp}.tar.gz $target)
+  osname=$1
+  osshort=$2
+  GOOS=$3
+  GOARCH=$4
+
+  if ! go version | egrep -q 'go(1\.1[456])' ; then
+    echo "go version must be 1.14 or above"
+    exit 1
+  fi
+
+  echo "Building ${osname} binary"
+  export GOOS
+  export GOARCH
+  go build -ldflags "$ldflags" -o $buildpath/$target go/cmd/gh-ost/main.go
+
+  if [ $? -ne 0 ]; then
+      echo "Build failed for ${osname}"
+      exit 1
+  fi
+
+  (cd $buildpath && tar cfz ./gh-ost-binary-${osshort}-${timestamp}.tar.gz $target)
+
+  if [ "$GOOS" == "linux" ] ; then
+    echo "Creating Distro full packages"
+    builddir=$(setuptree)
+    cp $buildpath/$target $builddir/gh-ost/usr/bin
+    cd $buildpath
+    fpm -v "${RELEASE_VERSION}" --epoch 1 -f -s dir -n gh-ost -m 'shlomi-noach <[email protected]>' --description "GitHub's Online Schema Migrations for MySQL " --url "https://github.com/github/gh-ost" --vendor "GitHub" --license "Apache 2.0" -C $builddir/gh-ost --prefix=/ -t rpm .
+    fpm -v "${RELEASE_VERSION}" --epoch 1 -f -s dir -n gh-ost -m 'shlomi-noach <[email protected]>' --description "GitHub's Online Schema Migrations for MySQL " --url "https://github.com/github/gh-ost" --vendor "GitHub" --license "Apache 2.0" -C $builddir/gh-ost --prefix=/ -t deb --deb-no-default-config-files .
+  fi
 }
 
-buildpath=/tmp/gh-ost
-target=gh-ost
-timestamp=$(date "+%Y%m%d%H%M%S")
-ldflags="-X main.AppVersion=${RELEASE_VERSION}"
-export GO15VENDOREXPERIMENT=1
+main() {
+  if [ -z "${RELEASE_VERSION}" ] ; then
+    RELEASE_VERSION=$(git describe --abbrev=0 --tags | tr -d 'v')
+  fi
+  if [ -z "${RELEASE_VERSION}" ] ; then
+    RELEASE_VERSION=$(cat RELEASE_VERSION)
+  fi
+
+
+  buildpath=/tmp/gh-ost-release
+  target=gh-ost
+  timestamp=$(date "+%Y%m%d%H%M%S")
+  ldflags="-X main.AppVersion=${RELEASE_VERSION}"
 
-mkdir -p ${buildpath}
-build macOS osx darwin amd64
-build GNU/Linux linux linux amd64
+  mkdir -p ${buildpath}
+  rm -rf ${buildpath:?}/*
+  build GNU/Linux linux linux amd64
+  # build macOS osx darwin amd64
+
+  echo "Binaries found in:"
+  find $buildpath/gh-ost* -type f -maxdepth 1
+}
 
-echo "Binaries found in:"
-ls -1 $buildpath/gh-ost-binary*${timestamp}.tar.gz
+main "$@"