Update a workflow file for GitHub Actions to create dmg format file a…

…nd modify Makefile
emic · Sep 7, 2024 · d5b6cfc · d5b6cfc
1 parent abd6185
commit d5b6cfc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -115,3 +115,19 @@ jobs:
            OS=linux "./goss-linux-arm64" --gossfile tests/goss.yaml validate --format documentation
            ./fmcsadmin -v
            EOF
+
+    - name: Create dmg format file for macOS
+      if: runner.os == 'macOS'
+      run: |
+        make dist
+        lipo -info "dist/fmcsadmin-${{ env.fmcsadmin_version }}-macos/fmcsadmin"
+        cd "dist/fmcsadmin-${{ env.fmcsadmin_version }}-macos"
+        pkgbuild --root . --identifier jp.co.emic.fmcsadmin --version "${{ env.fmcsadmin_version }}" --install-location /usr/local/bin ../fmcsadmin.pkg
+        cd ..
+        cp -p ../{LICENSE.txt,README.md,NOTICE.txt,release-notes.txt} .
+        cp -p ../macOS/{Distribution.xml,welcome.txt} .
+         productbuild --distribution Distribution.xml --resources . --package-path fmcsadmin.pkg "fmcsadmin-${{ env.fmcsadmin_version }}-unsigned.pkg"
+        pkgutil --check-signature "fmcsadmin-${{ env.fmcsadmin_version }}.pkg"
+        mkdir macos-dist
+        mv "{fmcsadmin-${{ env.fmcsadmin_version }}.pkg,LICENSE.txt,README.md,NOTICE.txt,release-notes.txt}" macos-dist/
+        hdiutil create -srcfolder ./macos-dist/ -fs HFS+ -format UDZO -volname "fmcsadmin-${{ env.fmcsadmin_version }}" "fmcsadmin-${{ env.fmcsadmin_version }}-macos.dmg"
diff --git a/Makefile b/Makefile
@@ -43,24 +43,24 @@ build-linux-arm64:
 	mkdir -p $(DIST_DIR)/$(LINUX_ARM64_DIR)
 	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(LINUX_ARM64_DIR)/$(NAME)
 
-ifeq ($(shell uname -m),x86_64)
+ifeq ($(shell uname -m),arm64)
 build-macos:
 	mkdir -p $(DIST_DIR)/$(MACOS_DIR)
-	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(MACOS_DIR)/$(NAME)
+	GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(MACOS_DIR)/$(NAME)
 else
 build-macos:
 	mkdir -p $(DIST_DIR)/$(MACOS_DIR)
-	GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(MACOS_DIR)/$(NAME)
+	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(MACOS_DIR)/$(NAME)
 endif
 
-ifeq ($(shell uname -m),x86_64)
+ifeq ($(shell uname -m),arm64)
 build-macos-alt:
 	mkdir -p $(DIST_DIR)/$(MACOS_ALT_DIR)
-	GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(MACOS_ALT_DIR)/$(NAME)
+	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(MACOS_ALT_DIR)/$(NAME)
 else
 build-macos-alt:
 	mkdir -p $(DIST_DIR)/$(MACOS_ALT_DIR)
-	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(MACOS_ALT_DIR)/$(NAME)
+	GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 $(GOBUILD) -ldflags "-X main.version=$(VERSION)" -o $(DIST_DIR)/$(MACOS_ALT_DIR)/$(NAME)
 endif
 
 build-windows: