From ff27f1080b457afdd1821c0ee9cdec430ad3d9f8 Mon Sep 17 00:00:00 2001
From: Katalina Okano <git@kat.cafe>
Date: Tue, 22 Sep 2020 23:23:02 -0400
Subject: [PATCH] ci: add build stamping

---
 .github/workflows/build.yml    | 11 ++++++++---
 hack/workspace_status.sh       |  4 ++++
 src/common/version/BUILD.bazel |  5 +++++
 src/discord-bot/BUILD.bazel    | 15 +++------------
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100755 hack/workspace_status.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb89520..67b3abb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,14 +24,19 @@ jobs:
 
       - name: Test
         run: |
-          "${GITHUB_WORKSPACE}/bin/bazel" test //src/...
+          "${GITHUB_WORKSPACE}/bin/bazel" test \
+            --stamp \
+            --workspace_status_command hack/workspace_status.sh \
+              //src/...
 
       - name: Docker Login
         run: |
-          echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+          echo ${{github.token}} | docker login -u ${{GITHUB_ACTOR}} --password-stdin
 
       - name: Publish Artifacts
         run: |
           "${GITHUB_WORKSPACE}/bin/bazel" query //src/... |\
           grep +publish |\
-          xargs -l1 "${GITHUB_WORKSPACE}/bin/bazel" run
+          xargs -l1 "${GITHUB_WORKSPACE}/bin/bazel" run \
+            --stamp \
+            --workspace_status_command hack/workspace_status.sh
diff --git a/hack/workspace_status.sh b/hack/workspace_status.sh
new file mode 100755
index 0000000..b048fff
--- /dev/null
+++ b/hack/workspace_status.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "STABLE_GIT_COMMIT $(git rev-parse --short HEAD)"
+echo "STABLE_GIT_BRANCH $(git rev-parse --abbrev-ref HEAD)"
+echo "BUILD_DATE $(date -Iseconds)"
\ No newline at end of file
diff --git a/src/common/version/BUILD.bazel b/src/common/version/BUILD.bazel
index ba9178d..55552bc 100644
--- a/src/common/version/BUILD.bazel
+++ b/src/common/version/BUILD.bazel
@@ -5,6 +5,11 @@ go_library(
     srcs = ["version.go"],
     importpath = "github.com/roleypoly/roleypoly/src/common/version",
     visibility = ["//visibility:public"],
+    x_defs = {
+        "GitCommit": "{STABLE_GIT_COMMIT}",
+        "GitBranch": "{STABLE_GIT_BRANCH}",
+        "BuildDate": "{BUILD_DATE}",
+    },
 )
 
 go_test(
diff --git a/src/discord-bot/BUILD.bazel b/src/discord-bot/BUILD.bazel
index 8604571..04fedc1 100644
--- a/src/discord-bot/BUILD.bazel
+++ b/src/discord-bot/BUILD.bazel
@@ -36,16 +36,7 @@ container_push(
     name = "+publish",
     format = "Docker",
     image = ":image",
-    registry = "docker.io",
-    repository = "roleypoly/discord-bot",
-    tag = "dev2",
-)
-
-container_push(
-    name = "+publish-2",
-    format = "Docker",
-    image = ":image",
-    registry = "docker.io",
-    repository = "roleypoly/discord-bot",
-    tag = "dev",
+    registry = "docker.pkg.github.com",
+    repository = "roleypoly/roleypoly/discord-bot",
+    tag = "{STABLE_GIT_BRANCH}",
 )