From 2791b3d48371f853640fb5fa650a53b3257125d9 Mon Sep 17 00:00:00 2001
From: Simon Kirsten <simon.kirsten@stud.h-da.de>
Date: Fri, 29 Nov 2019 03:05:57 +0100
Subject: [PATCH] Updated CI pipeline variables and pkger output dir
---
.gitlab-ci-server.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci-server.yml b/.gitlab-ci-server.yml
index 6f2f33e..d65460f 100644
--- a/.gitlab-ci-server.yml
+++ b/.gitlab-ci-server.yml
@@ -9,11 +9,11 @@ server:
# load version from prep stage
- export VERSION=$(cat version)
# TWITCH_CLIENT_ID is supplied via the GitLab CI/CD environment variables. This way only project owners can see the private key
- - export LDFLAGS="-s -X stream-server/internal/server.defaultTwitchClientID=$TWITCH_CLIENT_ID -X stream-server/internal/server.Version=$VERSION"
+ - export LDFLAGS="-s -X stream-server.DefaultTwitchClientID=$TWITCH_CLIENT_ID -X stream-server.Version=$VERSION"
script:
# run pkger to pack /internal/static
- - go run github.com/markbates/pkger/cmd/pkger
+ - go run github.com/markbates/pkger/cmd/pkger -o internal/server
- env GOOS=darwin GOARCH=386 go build -ldflags "$LDFLAGS" -o bin/$VERSION/darwin-x86/stream-server ./cmd/stream-server
- env GOOS=darwin GOARCH=amd64 go build -ldflags "$LDFLAGS" -o bin/$VERSION/darwin-x86_64/stream-server ./cmd/stream-server
--
GitLab