From 2d7d554f7a17371a961e6c9c8738df67d9f9d086 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 16 Jul 2022 19:35:04 -0700
Subject: [PATCH] Variable isn't evaluated, use common path
---
files/Makefile | 4 ++--
files/templates/matrix.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/files/Makefile b/files/Makefile
index 869646b..9b46988 100644
--- a/files/Makefile
+++ b/files/Makefile
@@ -28,10 +28,10 @@ dep:
@go get -v ./...
build: dep
- @gox -output="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}/{{.Dir}}_{{.OS}}_{{.Arch}}" -parallel=6 -osarch '!darwin/386'
+ @gox -output="${CI_PROJECT_DIR}/build/{{.Dir}}_{{.OS}}_{{.Arch}}" -parallel=6 -osarch '!darwin/386'
clean:
- @rm -rf "${CI_PROJECT_DIR}/${CI_PROJECT_NAME}"
+ @rm -rf "${CI_PROJECT_DIR}/build/"
help:
@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
diff --git a/files/templates/matrix.yml b/files/templates/matrix.yml
index 292732a..c97dc79 100644
--- a/files/templates/matrix.yml
+++ b/files/templates/matrix.yml
@@ -36,4 +36,4 @@ build:
- make
artifacts:
paths:
- - $CI_PROJECT_NAME
+ - build
--
GitLab