From c8ffdae859f63f9223c6870f20013aed5f2863db Mon Sep 17 00:00:00 2001 From: Chung-Ting Date: Thu, 11 Jan 2024 14:17:13 +0000 Subject: [PATCH] TUN-8146: Fix Makefile targets should not be run in parallel and install-go script was missing shebang --- .teamcity/install-cloudflare-go.sh | 2 ++ Makefile | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.teamcity/install-cloudflare-go.sh b/.teamcity/install-cloudflare-go.sh index 324dbd39..eedb4fdf 100755 --- a/.teamcity/install-cloudflare-go.sh +++ b/.teamcity/install-cloudflare-go.sh @@ -1,3 +1,5 @@ +# !/usr/bin/env bash + cd /tmp git clone -q https://github.com/cloudflare/go cd go/src diff --git a/Makefile b/Makefile index 3fb20eb5..665a1bf5 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# The targets cannot be run in parallel +.NOTPARALLEL: + VERSION := $(shell git describe --tags --always --match "[0-9][0-9][0-9][0-9].*.*") MSI_VERSION := $(shell git tag -l --sort=v:refname | grep "w" | tail -1 | cut -c2-) #MSI_VERSION expects the format of the tag to be: (wX.X.X). Starts with the w character to not break cfsetup.