Switch to GitHub actions (#90)

dgl · web-flow · commit 2bfe89c4ffed · 2021-02-10T09:46:13.000Z
* Switch to GitHub actions

* Use different source of thanos because we can't pull from docker hub due
to rate limits...

* Move integration test to Docker run only

* Switch to new image path under gresearch org

* Add an empty circleci config until an admin can delete it
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,159 +1,6 @@
 version: 2
-jobs:
-  lint:
-    docker:
-      - image: circleci/golang
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - lint-cache
-      - run:
-          name: Check goimports
-          command: |
-            files=$(go run golang.org/x/tools/cmd/goimports -l -local "github.com/G-Research" .)
-            if [[ $files != "" ]]; then
-              echo "Files need goimports running on them:"
-              echo "$files"
-              exit 1
-            fi
-      - save_cache:
-          key: lint-cache
-          paths:
-            - "/go/pkg"
 
-  build:
-    docker:
-      - image: circleci/golang:1.12.5
-    working_directory: /go/src/github.com/G-Research/geras
-    environment:
-      GO111MODULE: 'on'
-      GOBIN: "/go/bin"
-      SOURCE_IMAGE: g-research/geras
-      IMAGE_NAME: docker.pkg.github.com/g-research/geras/autobuild
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - pkg-cache
-      - run:
-          name: Build geras binary
-          command: go build ./cmd/geras
-      - run:
-          name: Run unit tests 
-          command: go test ./...
-      - run:
-          name: Check flags are documented
-          command: test/flags-doc.sh
-
-      # Create a docker environment we can use to build docker images
-      # See https://circleci.com/docs/2.0/building-docker-images/
-      - setup_remote_docker:
-          docker_layer_caching: true
-
-      - run:
-          name: Docker build
-          command: |
-            set -x
-            extra=
-            if [[ "$CIRCLE_TAG" != "" ]]; then
-              extra="--build-arg GERAS_VERSION=$CIRCLE_TAG"
-              branch=$CIRCLE_TAG
-            else
-              branch=$CIRCLE_BRANCH
-            fi
-            docker build -t g-research/geras:$branch --build-arg GIT_REVISION="$CIRCLE_SHA1" --build-arg GIT_BRANCH="$branch" --build-arg BUILD_USER="circleci" $extra .
-
-      - run:
-          name: Docker run without flags
-          command: |
-            if [[ -n $CIRCLE_TAG ]]; then
-              branch=$CIRCLE_TAG
-            else
-              branch=$CIRCLE_BRANCH
-            fi
-            set +e
-            docker run -t g-research/geras:$branch
-            exit=$?
-            # No flags; so expect help output. Also puts the version output into the CircleCI log
-            if [[ $exit != 1 ]]; then
-              echo "Unexpected exit code: $exit"
-              exit 1
-            fi
-            exit 0
-
-      - run:
-          name: Docker compose and test basic query
-          command: cd test && ./test-query.sh
-          
-      - run:
-          name: Push autobuild Docker image
-          command: |
-            echo "$GITHUB_DOCKER_TOKEN" | docker login docker.pkg.github.com -u "$GITHUB_DOCKER_USER" --password-stdin
-            set -x
-            if [[ $CIRCLE_TAG != "" ]]; then
-              branch=$CIRCLE_TAG
-            else
-              branch=$CIRCLE_BRANCH
-            fi
-            if [[ $CIRCLE_TAG == "" ]] && [[ $CIRCLE_BRANCH != "master" ]]; then
-              echo "Not on a tag or master, skipped."
-              exit 0
-            fi
-            docker tag $SOURCE_IMAGE:$branch $IMAGE_NAME:$branch
-            docker push $IMAGE_NAME:$branch
-
-      - save_cache: 
-          key: pkg-cache
-          paths:
-            - "/go/pkg"
-
-  docker_release:
-    docker:
-      - image: circleci/golang:1.12.5
-    environment:
-      SOURCE_IMAGE: docker.pkg.github.com/g-research/geras/autobuild
-      IMAGE_NAME: docker.pkg.github.com/g-research/geras/geras
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Release tagged commit as release Docker image
-          command: |
-            echo "$GITHUB_DOCKER_TOKEN" | docker login docker.pkg.github.com -u "$GITHUB_DOCKER_USER" --password-stdin
-            set -x
-            tag=$CIRCLE_TAG
-            if [[ $tag == "" ]]; then
-              echo "No tag found"
-              exit 1
-            fi
-            docker pull $SOURCE_IMAGE:$tag
-            docker pull $IMAGE_NAME:$tag || true
-            existing=$(docker images -q $IMAGE_NAME:$tag)
-            if [[ $existing != "" ]]; then
-              echo "Tag already exists, not overwriting"
-              exit 1
-            fi
-            docker tag $SOURCE_IMAGE:$tag $IMAGE_NAME:$tag
-            docker push $IMAGE_NAME:$tag
+jobs: {}
 
 workflows:
   version: 2
-
-  build-deploy:
-    jobs:
-      - lint
-      - build:
-          # Runs on all branches and tags matching /v.*/
-          filters:
-            tags:
-              only: /v.*/
-      - docker_release:
-          requires:
-            - build
-          # Only run on tags matching /v.*/
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /v.*/
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -0,0 +1,77 @@
+name: Docker
+on:
+  push:
+    branches:
+      - master
+      # For testing docker building if needed
+      - build/*
+
+    tags:
+      - v*
+
+env:
+  IMAGE_NAME: geras
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Log into registry
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+
+      - name: Build image
+        run: |
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          docker build --build-arg GERAS_VERSION=$VERSION --build-arg GIT_REVISION="$GITHUB_SHA" --build-arg GIT_BRANCH="$VERSION" --build-arg BUILD_USER="github-actions" -t image .
+
+      - name: Sanity check image
+        run: |
+          exit=0
+          docker run -t image || exit=$?
+          if [[ $exit != 1 ]]; then
+            echo "Expected 1 exit (usage), got $exit"
+            exit 1
+          fi
+          
+      # These need docker, so only run as part of the docker build process
+      - name: Run integration tests
+        run: |
+          cd test && ./test-query.sh
+
+      - name: Push image
+        if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
+        run: |
+          GITHUB_ID="docker.pkg.github.com/${{ github.repository }}/$IMAGE_NAME"
+          DOCKERHUB_ID="gresearch/$IMAGE_NAME"
+
+          # Change all uppercase to lowercase for github
+          GITHUB_ID=$(echo $GITHUB_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "master" ] && VERSION=latest
+          echo VERSION=$VERSION
+
+          set -x
+
+          # GitHub push
+          docker tag image $GITHUB_ID:$VERSION
+          docker push $GITHUB_ID:$VERSION
+
+          # DockerHub push for releases
+          if [[ $VERSION != latest ]]; then
+            docker tag image $DOCKERHUB_ID:$VERSION
+            docker push $DOCKERHUB_ID:$VERSION
+            # Also mark release as latest on DockerHub
+            docker tag image $DOCKERHUB_ID:latest
+            docker push $DOCKERHUB_ID:latest
+          fi
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -0,0 +1,37 @@
+name: Test
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/cache@v1
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Check formatting
+        run: |
+          files=$(go run golang.org/x/tools/cmd/goimports -l -local "github.com/G-Research" .)
+          if [[ $files != "" ]]; then
+            echo "Files need goimports running on them:"
+            echo "$files"
+            exit 1
+          fi
+
+      - name: Build binary
+        run: |
+          go build ./cmd/...
+
+      - name: Check flags are documented
+        run: |
+          ./test/flags-doc.sh
+
+      - name: Run tests
+        run: |
+          go test ./...
diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml
@@ -4,9 +4,10 @@ faketsdb:
     - 4242:4242
 
 geras:
-  # Uncomment this and comment out image to test locally
+  # Uncomment and comment out image below to build locally
   #build: ..
-  image: g-research/geras:$CIRCLE_BRANCH
+  # Default to "image" which is what GitHub actions builds
+  image: image
   ports:
     - 19000:19000
     - 19001:19001
@@ -20,7 +21,7 @@ geras:
     - "-http-listen=:19001"
 
 thanos:
-  image: thanosio/thanos:v0.8.1
+  image: quay.io/thanos/thanos:v0.18.0
   container_name: thanos
   ports:
     - 10902:10902
diff --git a/test/test-query.sh b/test/test-query.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 sudo apt-get install -y jq
 
-echo "CIRCLE_BRANCH=$CIRCLE_BRANCH" > .env
-
 docker-compose up -d --force-recreate
 if [[ $? != 0 ]]; then
   docker-compose logs
