address review

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

Hide file tree

Showing 4 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/CHANGELOG.md b/CHANGELOG.md
@@ -4217,7 +4217,6 @@ This is a  **highly recommended** but optional Lotus v1.11.1 release that introd
 - Release Template: remove binary validation step ([filecoin-project/lotus#6709](https://github.com/filecoin-project/lotus/pull/6709))
 - Reset of the interop network ([filecoin-project/lotus#6689](https://github.com/filecoin-project/lotus/pull/6689))
 - Update version.go to 1.11.1 ([filecoin-project/lotus#6621](https://github.com/filecoin-project/lotus/pull/6621))
-- chore: pin golanglint-ci to v1.58.2 ([filecoin-project/lotus#12054](https://github.com/filecoin-project/lotus/pull/12054))
 
 ## Contributors
 

diff --git a/Makefile b/Makefile
@@ -383,3 +383,4 @@ docsgen-cli: lotus lotus-miner lotus-worker
 
 print-%:
 	@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 number	Diff line change
Expand Up		@@ -383,3 +383,4 @@ docsgen-cli: lotus lotus-miner lotus-worker

		print-%:
		@echo $=$($)
-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 @@