diff --git a/.gitlab-ci-scripts/goreleaser.sh b/.gitlab-ci-scripts/goreleaser.sh index 831e7934..3684e56d 100755 --- a/.gitlab-ci-scripts/goreleaser.sh +++ b/.gitlab-ci-scripts/goreleaser.sh @@ -6,5 +6,5 @@ GORELEASER_CONFIG=".goreleaser.yml" if [ -n "$CI_COMMIT_TAG" ] && echo "$CI_COMMIT_TAG" | grep -qv '~'; then GORELEASER_CONFIG=".goreleaser-release.yml" fi -goreleaser release -f $GORELEASER_CONFIG --release-notes /tmp/shared/release.md +goreleaser release -f $GORELEASER_CONFIG --release-notes ../shared/release.md ls -l results \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 730cca6e..eabdf7b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,8 @@ build_migratedb: prerelease: stage: release image: - name: docker:stable + name: goreleaser/goreleaser + entrypoint: [ "" ] services: - docker:dind only: @@ -81,17 +82,7 @@ prerelease: DOCKER_REGISTRY: https://index.docker.io/v1/ GODIR: /go/src/github.com/oidc-mytoken/server script: - - docker run --rm --privileged - -v $PWD:/$GODIR - -w $GODIR - -v "${PWD}/../shared":/tmp/shared - -v /var/run/docker.sock:/var/run/docker.sock - -e DOCKER_USERNAME - -e DOCKER_PASSWORD - -e DOCKER_REGISTRY - -e GITHUB_TOKEN - --entrypoint=$GODIR/.gitlab-ci-scripts/release.sh - goreleaser/goreleaser + - .gitlab-ci-scripts/release.sh deploy-dev: stage: deploy