From bb48dbda3a2921aa8a2aa79bac91834637e77d92 Mon Sep 17 00:00:00 2001 From: Nuru Date: Mon, 5 Apr 2021 15:18:28 -0700 Subject: [PATCH] bugfix --- templates/.github/CODEOWNERS | 4 ++-- templates/.github/workflows/validate-codeowners.yml | 2 ++ templates/Makefile.build-harness | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/.github/CODEOWNERS b/templates/.github/CODEOWNERS index 2537f2f81..6f64b5a33 100644 --- a/templates/.github/CODEOWNERS +++ b/templates/.github/CODEOWNERS @@ -15,8 +15,8 @@ # Cloud Posse must review any changes to standard context definition, # but some changes can be rubber-stamped. -**/*.tf @cloudposse/engineering @cloudposse/approvers -README.yaml @cloudposse/engineering @cloudposse/approvers +**/*.tf @cloudposse/engineering @cloudposse/contributors @cloudposse/approvers +README.yaml @cloudposse/engineering @cloudposse/contributors @cloudposse/approvers README.md @cloudposse/engineering @cloudposse/contributors @cloudposse/approvers docs/*.md @cloudposse/engineering @cloudposse/contributors @cloudposse/approvers diff --git a/templates/.github/workflows/validate-codeowners.yml b/templates/.github/workflows/validate-codeowners.yml index 386eb2868..c5193b625 100644 --- a/templates/.github/workflows/validate-codeowners.yml +++ b/templates/.github/workflows/validate-codeowners.yml @@ -1,5 +1,7 @@ name: Validate Codeowners on: + workflow_dispatch: + pull_request: jobs: diff --git a/templates/Makefile.build-harness b/templates/Makefile.build-harness index 95bbee01e..1603aa8af 100644 --- a/templates/Makefile.build-harness +++ b/templates/Makefile.build-harness @@ -10,13 +10,14 @@ export BUILD_HARNESS_PROJECT ?= build-harness export BUILD_HARNESS_DOCKER_IMAGE ?= $(BUILD_HARNESS_ORG)/$(BUILD_HARNESS_PROJECT) export BUILD_HARNESS_BRANCH ?= master export BUILD_HARNESS_CLONE_URL ?= https://github.com/$(BUILD_HARNESS_ORG)/$(BUILD_HARNESS_PROJECT).git -# It is kind of expensive to figure out the Docker SHA tag, so we just define the command here, and only call it when needed -export BUILD_HARNESS_DOCKER_SHA_TAG_CMD := git -C "$(BUILD_HARNESS_PATH)" log -n 1 --format=sha-%h 2>/dev/null || echo latest # Resolves BUILD_HARNESS_PATH to BUILD_HARNESS_PATH_LOCAL when BUILD_HARNESS_PATH does not exist BUILD_HARNESS_PATH ?= $(shell until [ -d "$(BUILD_HARNESS_PROJECT)" ] || [ "`pwd`" == '/' ]; do cd ..; done; pwd)/$(BUILD_HARNESS_PROJECT) BUILD_HARNESS_PATH_LOCAL := $(PWD)/$(BUILD_HARNESS_PROJECT) export BUILD_HARNESS_PATH := $(or $(wildcard $(BUILD_HARNESS_PATH)),$(BUILD_HARNESS_PATH_LOCAL)) +# It is kind of expensive to figure out the Docker SHA tag, so we just define the command here, and only call it when needed +# With the ":=" syntax, it stores the current value of BUILD_HARNESS_PATH, so this has to come after that has been set with ":=" +export BUILD_HARNESS_DOCKER_SHA_TAG_CMD := git -C "$(BUILD_HARNESS_PATH)" log -n 1 --format=sha-%h 2>/dev/null || echo latest # Toggles the auto-init feature BUILD_HARNESS_AUTO_INIT ?= false