address review

- resolve one more conflicts - revert 2 new line added
filecoin-project · Jun 25, 2024 · 8d4f755 · 8d4f755
1 parent 69ef408
commit 8d4f755
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -86,11 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     env:
-<<<<<<< HEAD
-      PUBLISH: ${{ startsWith(github.ref, 'refs/tags/') }}
-=======
       PUBLISH: ${{ startsWith(inputs.ref || github.ref, 'refs/tags/') }}
->>>>>>> release/v1.27.1
     steps:
       - uses: actions/checkout@v4
         with:
@@ -113,13 +109,9 @@ jobs:
         with:
           name: lotus-macOS-ARM64
           path: darwin_arm64
-<<<<<<< HEAD
-      - uses: ./.github/actions/install-go
-=======
       - uses: ./actions/.github/actions/install-go
         with:
           working-directory: lotus
->>>>>>> release/v1.27.1
       - uses: ipfs/download-ipfs-distribution-action@v1
         with:
           name: kubo

diff --git a/Makefile b/Makefile
@@ -382,4 +382,4 @@ docsgen-cli: lotus lotus-miner lotus-worker
 .PHONY: docsgen-cli
 
 print-%:
-	@echo $*=$($*)
+	@echo $*=$($*)
diff --git a/scripts/version-check.sh b/scripts/version-check.sh
@@ -32,7 +32,6 @@ function validate_lotus_version_matches_tag(){
 
 _lotus_path=$1
 
-
 if [[ "$GITHUB_REF" == refs/tags/* ]]; then
   validate_lotus_version_matches_tag "${_lotus_path}" "${GITHUB_REF#refs/tags/}"
 else
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,6 @@ function validate_lotus_version_matches_tag(){ @@
     _lotus_path=$1
     if [[ "$GITHUB_REF" == refs/tags/* ]]; then
       validate_lotus_version_matches_tag "${_lotus_path}" "${GITHUB_REF#refs/tags/}"
     else
@@ Expand Down @@