diff --git a/.github/actions/setup-branch/action.yml b/.github/actions/setup-branch/action.yml
index 7dae9376873..e47c0d15aa8 100644
--- a/.github/actions/setup-branch/action.yml
+++ b/.github/actions/setup-branch/action.yml
@@ -10,7 +10,7 @@ runs:
pull_request)
BRANCH=${GITHUB_HEAD_REF}
;;
- push)
+ push | release)
BRANCH=${GITHUB_REF##*/}
;;
esac
diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml
new file mode 100644
index 00000000000..c3441180fa0
--- /dev/null
+++ b/.github/workflows/ci-build-binaries.yml
@@ -0,0 +1,28 @@
+name: Build binaries
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build-binaries:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: true
+
+ - uses: actions/setup-go@v2
+ with:
+ go-version: ^1.15
+
+ - name: Export BRANCH variable
+ uses: ./.github/actions/setup-branch
+
+ - name: Install tools
+ run: make install-ci
+
+ - name: Build binaries
+ run: make build-all-platforms
diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml
new file mode 100644
index 00000000000..5a8692c3e52
--- /dev/null
+++ b/.github/workflows/ci-docker-build.yml
@@ -0,0 +1,53 @@
+name: Build docker images
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ docker-images:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: true
+
+ - name: Fetch git tags
+ run: |
+ git fetch --prune --unshallow --tags
+
+ - uses: actions/setup-go@v2
+ with:
+ go-version: ^1.15
+
+ - uses: actions/setup-node@v2-beta
+ with:
+ node-version: '10'
+
+ - uses: docker/login-action@v1
+ id: dockerhub-login
+ with:
+ username: jaegertracingbot
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ env:
+ DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+ if: env.DOCKERHUB_TOKEN != null
+
+ - name: Export DOCKERHUB_LOGIN variable
+ run: |
+ echo "DOCKERHUB_LOGIN=true" >> $GITHUB_ENV
+ if: steps.dockerhub-login.outcome == 'success'
+
+ - name: Export BRANCH variable
+ uses: ./.github/actions/setup-branch
+
+ - name: Install tools
+ run: make install-ci
+
+ - name: Build docker images
+ run: make docker
+
+ - name: Upload docker images
+ run: bash scripts/travis/upload-all-docker-images.sh
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
new file mode 100644
index 00000000000..b4b9affff1b
--- /dev/null
+++ b/.github/workflows/ci-release.yml
@@ -0,0 +1,75 @@
+name: Publish release
+
+on:
+ release:
+ types:
+ - published
+
+jobs:
+ publish-release:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ submodules: true
+
+ - name: Fetch git tags
+ run: |
+ git fetch --prune --unshallow --tags
+
+ - uses: actions/setup-go@v2
+ with:
+ go-version: ^1.15
+
+ - uses: actions/setup-node@v2-beta
+ with:
+ node-version: '10'
+
+ - uses: docker/login-action@v1
+ id: dockerhub-login
+ with:
+ username: jaegertracingbot
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+ env:
+ DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+ if: env.DOCKERHUB_TOKEN != null
+
+ - name: Export DOCKERHUB_LOGIN variable
+ run: |
+ echo "DOCKERHUB_LOGIN=true" >> $GITHUB_ENV
+ if: steps.dockerhub-login.outcome == 'success'
+
+ - name: Export BRANCH variable
+ uses: ./.github/actions/setup-branch
+
+ - name: Install tools
+ run: make install-ci
+
+ - name: Build binaries
+ id: build-binaries
+ run: make build-all-platforms
+
+ - name: Package binaries
+ id: package-binaries
+ run: bash scripts/travis/package-deploy.sh
+ if: steps.build-binaries.outcome == 'success'
+
+ - name: Upload binaries
+ uses: svenstaro/upload-release-action@v2
+ with:
+ file: deploy/*.tar.gz
+ file_glob: true
+ tag: ${{ github.ref }}
+ repo_token: ${{ secrets.GITHUB_TOKEN }}
+ if: steps.package-binaries.outcome == 'success'
+
+ - name: Build docker images
+ id: build-images
+ run: make docker
+
+ - name: Upload docker images
+ run: bash scripts/travis/upload-all-docker-images.sh
+ if: steps.build-images.outcome == 'success'
+
+ - name: Build, test, and publish all-in-one image
+ run: bash scripts/travis/build-all-in-one-image.sh
diff --git a/scripts/travis/package-deploy.sh b/scripts/travis/package-deploy.sh
index 2bed8213843..e0e22540bad 100755
--- a/scripts/travis/package-deploy.sh
+++ b/scripts/travis/package-deploy.sh
@@ -46,12 +46,6 @@ function package {
rm -rf $PACKAGE_STAGING_DIR
}
-# script start
-if [ "$DEPLOY" != true ]; then
- echo "Skipping the packaging of binaries as \$DEPLOY was not true."
- exit 0
-fi
-
set -e
DEPLOY_STAGING_DIR=./deploy-staging
diff --git a/scripts/travis/upload-all-docker-images.sh b/scripts/travis/upload-all-docker-images.sh
index 8273b950a1f..2fc33892c61 100755
--- a/scripts/travis/upload-all-docker-images.sh
+++ b/scripts/travis/upload-all-docker-images.sh
@@ -1,18 +1,14 @@
#!/bin/bash
-# this script should only be run after build-docker-images.sh
+# this script expects all docker images to be already built, it only uploads them to Docker Hub
-set -e
+set -euxf -o pipefail
BRANCH=${BRANCH:?'missing BRANCH env var'}
+DOCKERHUB_LOGIN=${DOCKERHUB_LOGIN:-false}
-if [[ "$TRAVIS_SECURE_ENV_VARS" == "false" ]]; then
- echo "skip docker upload, TRAVIS_SECURE_ENV_VARS=$TRAVIS_SECURE_ENV_VARS"
- exit 0
-fi
-
-# Only push images to Docker Hub for master branch or for release tags vM.N.P
-if [[ "$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+# Only push images to Docker Hub for master branch or for release tags vM.N.P and when dockerhub login is done
+if [[ ("$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$) && "$DOCKERHUB_LOGIN" == "true" ]]; then
echo "upload to Docker Hub, BRANCH=$BRANCH"
else
echo 'skip Docker upload, only allowed for tagged releases or master (latest tag)'