ci: Resolve goreleaser issues (#192)

.circleci/config.yml

@@ -45,11 +45,18 @@ jobs:
     working_directory: /go/src/github.com/ory/oathkeeper
     steps:
       - checkout
+      - setup_remote_docker
+      - run:
+          command: |
+            ./.circleci/release_name.bash
+            echo 'export DOCKER_SHORT_TAG=$CIRCLE_SHA1' >> $BASH_ENV
+            source $BASH_ENV
       - run: go mod download
       - run: go install github.com/ory/go-acc github.com/mattn/goveralls
       - run: go-acc -o coverage.txt ./... -- -failfast -timeout=20m
       - run: test -z "$CIRCLE_PR_NUMBER" && goveralls -service=circle-ci -coverprofile=coverage.txt -repotoken=$COVERALLS_REPO_TOKEN || echo "forks are not allowed to push to coveralls"
       - run: ./test/e2e/run.sh
+      - run: curl -sL https://git.io/goreleaser | bash -s -- --snapshot --skip-publish --rm-dist
 
   release:
     docker:
@@ -67,7 +74,6 @@ jobs:
             source $BASH_ENV
       - setup_remote_docker
       - run: docker login --username "$DOCKER_USERNAME" --password "$DOCKER_PASSWORD"
-      - run: cp ./.releaser/LICENSE.txt ./LICENSE.txt
       - run: curl -sL https://git.io/goreleaser | bash
 
   docs:

.circleci/release_name.bash

@@ -6,6 +6,8 @@ tag_name=$(echo ${release} | jq -r ".[0].name")
 
 if [[ -n "$tag_name" ]]; then
     echo "export RELEASE_NAME=$tag_name" >> $BASH_ENV
-else
+elif [[ -n "$tag" ]]; then
     echo "export RELEASE_NAME=$tag" >> $BASH_ENV
+else
+    echo "export RELEASE_NAME=$CIRCLE_SHA1" >> $BASH_ENV
 fi

.goreleaser.yml

@@ -8,13 +8,14 @@ env:
 before:
   hooks:
     - go mod download
+    - cp ./.releaser/LICENSE.txt ./LICENSE.txt
 
 builds:
   -
     flags:
       - -a
     ldflags:
-      - -s -w -X github.com/ory/oathkeeper/cmd.Version={{.Tag}} -X github.com/ory/oathkeeper/cmd.Commit={{.FullCommit}} -X github.com/ory/oathkeeper/cmd.Date={{.Date}}
+      - -s -w -X github.com/ory/oathkeeper/cmd.Version={{.Env.RELEASE_NAME}} -X github.com/ory/oathkeeper/cmd.Commit={{.FullCommit}} -X github.com/ory/oathkeeper/cmd.Date={{.Date}}
     binary: oathkeeper
     env:
       - CGO_ENABLED=0
@@ -33,7 +34,7 @@ builds:
       - windows
       - darwin
 
-archive:
+archives:
   -
     replacements:
       darwin: macOS