Merge branch 'main' into closeconn

kylecarbs · web-flow · commit 94cf44237aa0 · 2022-02-18T11:19:59.000-06:00
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -187,12 +187,7 @@ jobs:
   deploy:
     name: "deploy"
     runs-on: ubuntu-latest
-    # Temporarily disable the 'deploy' job until issue is fixed:
-    # https://github.com/coder/coder/issues/287
-    # As a part of a fix for that, uncomment the below line
-    # and delete the 'if' after:
-    # if: github.event_name != 'pull_request'
-    if: false
+    if: github.event_name != 'pull_request'
     permissions:
       contents: read
       id-token: write
diff --git a/images/coder/Dockerfile b/images/coder/Dockerfile
@@ -1,5 +1,9 @@
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
+RUN yum install -y yum-utils
+RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
+RUN yum install -y terraform
+
 COPY coderd /coder/coderd
 RUN chmod +x /coder/coderd
 
diff --git a/scripts/datadog-cireport/main.go b/scripts/datadog-cireport/main.go
@@ -59,6 +59,11 @@ func main() {
 	}
 	commitParts := strings.Split(string(commitData), ",")
 
+	branch := os.Getenv("GITHUB_HEAD_REF")
+	if branch == "" {
+		branch = os.Getenv("GITHUB_BASE_REF")
+	}
+
 	tags := map[string]string{
 		"service":              "coder",
 		"_dd.cireport_version": "2",
@@ -78,7 +83,7 @@ func main() {
 		"ci.provider.name":   "github",
 		"ci.workspace_path":  os.Getenv("GITHUB_WORKSPACE"),
 
-		"git.branch":         os.Getenv("GITHUB_REF_NAME"),
+		"git.branch":         branch,
 		"git.commit.sha":     githubSHA,
 		"git.repository_url": fmt.Sprintf("%s/%s.git", githubServerURL, githubRepository),
 
