Merge pull request #6612 from spacemeshos/athena-release-disable-win-…

…macx86 Fix releasing on Windows
spacemeshos · Jan 14, 2025 · 4f0127f · 4f0127f
2 parents 3fc36f6 + 1ad8665
commit 4f0127f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -145,19 +145,19 @@ jobs:
           echo "OUTNAME_WIN_AMD64=go-spacemesh-${{ github.ref_name }}-win-amd64" >> $GITHUB_ENV
           echo "OUTNAME_LINUX_AMD64=go-spacemesh-${{ github.ref_name }}-linux-amd64" >> $GITHUB_ENV
           echo "OUTNAME_LINUX_ARM64=go-spacemesh-${{ github.ref_name }}-linux-arm64" >> $GITHUB_ENV
-          echo "OUTNAME_MAC_AMD64=go-spacemesh-${{ github.ref_name }}-mac-amd64" >> $GITHUB_ENV
+          # echo "OUTNAME_MAC_AMD64=go-spacemesh-${{ github.ref_name }}-mac-amd64" >> $GITHUB_ENV
           echo "OUTNAME_MAC_ARM64=go-spacemesh-${{ github.ref_name }}-mac-arm64" >> $GITHUB_ENV
 
           echo "SHA256_WIN_AMD64=$(cat sha256-win-amd64/sha256-win-amd64.txt)" >> $GITHUB_ENV
           echo "SHA256_LINUX_AMD64=$(cat sha256-linux-amd64/sha256-linux-amd64.txt)" >> $GITHUB_ENV
           echo "SHA256_LINUX_ARM64=$(cat sha256-linux-arm64/sha256-linux-arm64.txt)" >> $GITHUB_ENV
-          echo "SHA256_MAC_AMD64=$(cat sha256-mac-amd64/sha256-mac-amd64.txt)" >> $GITHUB_ENV
+          # echo "SHA256_MAC_AMD64=$(cat sha256-mac-amd64/sha256-mac-amd64.txt)" >> $GITHUB_ENV
           echo "SHA256_MAC_ARM64=$(cat sha256-mac-arm64/sha256-mac-arm64.txt)" >> $GITHUB_ENV
 
           echo "win-amd64: $(cat sha256-win-amd64/sha256-win-amd64.txt)" >> sha256sum.yaml
           echo "linux-amd64: $(cat sha256-linux-amd64/sha256-linux-amd64.txt)" >> sha256sum.yaml
           echo "linux-arm64: $(cat sha256-linux-arm64/sha256-linux-arm64.txt)" >> sha256sum.yaml
-          echo "mac-amd64: $(cat sha256-mac-amd64/sha256-mac-amd64.txt)" >> sha256sum.yaml
+          # echo "mac-amd64: $(cat sha256-mac-amd64/sha256-mac-amd64.txt)" >> sha256sum.yaml
           echo "mac-arm64: $(cat sha256-mac-arm64/sha256-mac-arm64.txt)" >> sha256sum.yaml
 
       - name: Setup gcloud authentication
@@ -201,7 +201,6 @@ jobs:
           body: |
             ## Zip Files
             - Windows amd64: https://go-spacemesh-release-builds.spacemesh.network/${{ github.ref_name }}/${{ env.OUTNAME_WIN_AMD64 }}.zip
-            - macOS amd64: https://go-spacemesh-release-builds.spacemesh.network/${{ github.ref_name }}/${{ env.OUTNAME_MAC_AMD64 }}.zip
             - macOS arm64: https://go-spacemesh-release-builds.spacemesh.network/${{ github.ref_name }}/${{ env.OUTNAME_MAC_ARM64 }}.zip
             - Linux amd64: https://go-spacemesh-release-builds.spacemesh.network/${{ github.ref_name }}/${{ env.OUTNAME_LINUX_AMD64 }}.zip
             - Linux arm64: https://go-spacemesh-release-builds.spacemesh.network/${{ github.ref_name }}/${{ env.OUTNAME_LINUX_ARM64 }}.zip
@@ -211,9 +210,11 @@ jobs:
             - Windows amd64 - sha256 : ${{ env.SHA256_WIN_AMD64 }}
             - Linux amd64 - sha256: ${{ env.SHA256_LINUX_AMD64 }}
             - Linux arm64 - sha256: ${{ env.SHA256_LINUX_ARM64 }}
-            - macOS amd64 - sha256: ${{ env.SHA256_MAC_AMD64 }}
             - macOS arm64 - sha256: ${{ env.SHA256_MAC_ARM64 }}
 
             For information about changes in this release see the [changelog](https://github.com/spacemeshos/go-spacemesh/blob/${{ github.ref_name }}/CHANGELOG.md).
           draft: false
           prerelease: true
+            # FIXME: reenable macos 
+            # - macOS amd64: https://go-spacemesh-release-builds.spacemesh.network/${{ github.ref_name }}/${{ env.OUTNAME_MAC_AMD64 }}.zip
+            # - macOS amd64 - sha256: ${{ env.SHA256_MAC_AMD64 }}
diff --git a/Makefile-libs.Inc b/Makefile-libs.Inc
@@ -58,32 +58,32 @@ POSTRS_SERVICE_URL ?= https://github.com/spacemeshos/post-rs/releases/download/v
 
 ATHENA_SETUP_REV = v0.6.3
 ATHENA_SETUP_RELEASE = v0.6.3
-ATHENA_SETUP_ARTIFACT = athena_vmlib_$(ATHENA_SETUP_REV)_$(GOOS)_$(GOARCH).tar.gz
-ATHENA_SETUP_ARTIFACT_URL ?= https://github.com/athenavm/athena/releases/download/$(ATHENA_SETUP_RELEASE)/$(ATHENA_SETUP_ARTIFACT)
 
 ifeq ($(platform), windows)
 	POSTRS_SETUP_LIBS = post.h post.dll
 
 	POSTRS_PROFILER_BIN = profiler.exe
 	POSTRS_SERVICE_BIN = post-service.exe
 
-	ATHENA_LIB = libathena_vmlib.dll
+	ATHENA_LIB = athena_vmlib.dll
 	ATHENA_SETUP_LIBS = $(ATHENA_LIB) include/athcon/helpers.h include/athcon/athcon.h
+	ATHENA_SETUP_ARTIFACT = athena_vmlib_$(ATHENA_SETUP_REV)_win32_amd64.zip
 else
 	ifeq ($(platform), $(filter $(platform), macos macos-m1))
 		POSTRS_SETUP_LIBS = post.h libpost.dylib
 		ATHENA_LIB = libathena_vmlib.dylib
-		ATHENA_SETUP_LIBS = $(ATHENA_LIB) include/athcon/helpers.h include/athcon/athcon.h
 	else
 		POSTRS_SETUP_LIBS = post.h libpost.so
 		ATHENA_LIB = libathena_vmlib.so
-		ATHENA_SETUP_LIBS = $(ATHENA_LIB) include/athcon/helpers.h include/athcon/athcon.h
 	endif
 
 	POSTRS_PROFILER_BIN = profiler
 	POSTRS_SERVICE_BIN = post-service
+	ATHENA_SETUP_LIBS = $(ATHENA_LIB) include/athcon/helpers.h include/athcon/athcon.h
+	ATHENA_SETUP_ARTIFACT = athena_vmlib_$(ATHENA_SETUP_REV)_$(GOOS)_$(GOARCH).tar.gz
 endif
 
+ATHENA_SETUP_ARTIFACT_URL ?= https://github.com/athenavm/athena/releases/download/$(ATHENA_SETUP_RELEASE)/$(ATHENA_SETUP_ARTIFACT)
 BINDIR_POSTRS_SETUP_LIBS = $(foreach X,$(POSTRS_SETUP_LIBS),$(BIN_DIR)$(X))
 BINDIR_ATHENA_SETUP_LIBS = $(foreach X,$(ATHENA_SETUP_LIBS),$(BIN_DIR)$(X))
 
@@ -114,7 +114,11 @@ $(BIN_DIR).athena.version.$(ATHENA_SETUP_REV): $(PROJ_DIR)$(ATHENA_SETUP_ARTIFAC
 
 $(BINDIR_ATHENA_SETUP_LIBS): $(BIN_DIR).athena.version.$(ATHENA_SETUP_REV)
 	mkdir -p $(dir $@)
+ifeq ($(GOOS),windows)
+	unzip -DD -o $(PROJ_DIR)$(ATHENA_SETUP_ARTIFACT) -d $(BIN_DIR) $(subst $(BIN_DIR),,$@)
+else
 	tar xzf $(PROJ_DIR)$(ATHENA_SETUP_ARTIFACT) -C $(BIN_DIR) $(subst $(BIN_DIR),,$@)
+endif
 	touch $@
 
 # rename athena VM library