From dbb6e5894e4ae88d406a6893da86cde6f6ad2c35 Mon Sep 17 00:00:00 2001 From: snmsts Date: Mon, 14 Oct 2024 14:05:17 +0900 Subject: [PATCH] try to use matrix.target to name release package. --- .github/workflows/linux.yml | 4 ++-- .github/workflows/osx.yml | 1 + Makefile.am | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b5ec7ea..9796e21 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -17,8 +17,8 @@ jobs: # set default docker platform and image suffix. - {docker-platform: linux/amd64 ,docker-image-suffix: '', makeopts: musl } - {target: arm64 ,docker-platform: linux/arm64 ,docker-image-suffix: 'aarch64' } - - {image: deb, makeopts: deb, target: x86-64 } - - {image: pandoc, makeopts: docs, target: x86-64 } + - {image: deb, makeopts: deb, target: x86-64 ,docker-platform: linux/arm64} + - {image: pandoc, makeopts: docs, target: x86-64 ,docker-platform: linux/arm64} environment: SET_VERSION diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index c4cc7bb..5951496 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -29,6 +29,7 @@ jobs: CFLAGS: -mmacosx-version-min=10.9 CXXFLAGS: -mmacosx-version-min=10.9 LDFLAGS: -mmacosx-version-min=10.9 + ARCH: ${{ matrix.target }} run: | gcc -v ./bootstrap diff --git a/Makefile.am b/Makefile.am index 7673fac..db7e060 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,7 +131,7 @@ brewpr: git pull if [ `uname` = 'Darwin' ];then brew bump-formula-pr -v --url=https://github.com/roswell/roswell/archive/`git describe --abbrev=0 --tags`.tar.gz roswell; fi -PACK = $(PACKAGE)-$(VERSION)-$(shell uname -s | tr '[A-Z]' '[a-z]' | sed -E 's/([^-]*).*/\1/')-$(shell uname -m)$(SBCL_BIN_VARIANT) +PACK = $(PACKAGE)-$(VERSION)-$(shell uname -s | tr '[A-Z]' '[a-z]' | sed -E 's/([^-]*).*/\1/')-$(ARCH)$(SBCL_BIN_VARIANT) roswell/Makefile: rm -rf roswell