From fcc796311728f00636f75afe3b7ee10eea896a2f Mon Sep 17 00:00:00 2001 From: leixiang <38041294+leiless@users.noreply.github.com> Date: Thu, 25 Mar 2021 19:31:19 +0800 Subject: [PATCH] build.yml: Try to fix macOS linefeed problem v3 --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e0468c..3fe168e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -206,6 +206,9 @@ jobs: xcode-select -p xcodebuild -version + # BSD sed sucks! + brew install gnu-sed + DNSREDIR_DIR=$PWD REPO_ADDR=$(git remote get-url origin | sed -e 's/^https:\/\///' -e 's/\.git//') HEAD_COMMIT=$(git describe --dirty --always) @@ -225,9 +228,9 @@ jobs: ln -s $DNSREDIR_DIR ~/go/pkg/mod/github.com/leiless/dnsredir@$DNSREDIR_TAG pushd $COREDNS_DIR - sed -i '' "s|forward:forward|dnsredir:$REPO_ADDR\nforward:forward|g" plugin.cfg - sed -i '' "s|GITCOMMIT:=|CUSTOM_FLAGS=-X $REPO_ADDR.pluginVersion=$DNSREDIR_TAG -X $REPO_ADDR.pluginHeadCommit=$HEAD_COMMIT\nGITCOMMIT:=|g" Makefile - sed -i '' 's|$(GITCOMMIT)|$(GITCOMMIT) $(CUSTOM_FLAGS)|g' Makefile + gsed -i "s|forward:forward|dnsredir:$REPO_ADDR\nforward:forward|g" plugin.cfg + gsed -i "s|GITCOMMIT:=|CUSTOM_FLAGS=-X $REPO_ADDR.pluginVersion=$DNSREDIR_TAG -X $REPO_ADDR.pluginHeadCommit=$HEAD_COMMIT\nGITCOMMIT:=|g" Makefile + gsed -i 's|$(GITCOMMIT)|$(GITCOMMIT) $(CUSTOM_FLAGS)|g' Makefile go generate coredns.go git diff git status