Improved CI

.gitlab-ci-docs.yml

@@ -15,7 +15,14 @@ pages:
   - mkdocs build
   - mv site public # move mkdocs output to public
   - mv binaries public/ # move binaries from the build stage to public
-  
+
   artifacts:
     paths:
-    - public
+      - public
+
+    # We don't need the artifacts. They are only needed for the internal pages:deploy job
+    expire_in: 1h
+
+  only:
+    # Only deploy to GitLab pages on tags and also not on forked repositories
+    - tags@simons-nzse-2/stream-tv

.gitlab-ci-server.yml

@@ -4,9 +4,9 @@ server:
   stage: build
   image: golang:1.12
 
-  # TWITCH_CLIENT_ID is supplied via the GitLab CI/CD environment variables. This way only project owners can see the private key.
+  # TWITCH_CLIENT_ID is supplied via the GitLab CI/CD environment variables. This way only project owners can see the private key
   variables:
-    LDFLAGS: -s -X main.twitchClientID=$TWITCH_CLIENT_ID -X main.version=$CI_COMMIT_TAG-$CI_COMMIT_SHORT_SHA
+    LDFLAGS: -s -X main.twitchClientID=$TWITCH_CLIENT_ID -X main.version=${CI_COMMIT_TAG:-untagged}-$CI_COMMIT_SHORT_SHA
   
   before_script:
     - go mod download
@@ -26,3 +26,6 @@ server:
   artifacts:
     paths:
       - binaries/
+
+    # We don't really need to keep old builds. We can always just rebuild them
+    expire_in: 1d