fix(release): make target configurable

dylibso · Jul 28, 2023 · 3676f12 · 3676f12
1 parent cf20de5
commit 3676f12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,21 +27,21 @@ jobs:
         name: 'OCaml/Opam cache'
         uses: actions/cache@v3
         with:
-          key: 'wasmstore-opam-${{ matrix.ocaml-compiler }}-${{ matrix.os }}'
+          key: 'wasmstore-opam-${{ matrix.ocaml-compiler }}-${{ matrix.target }}-${{ matrix.os }}'
           path: ~/.opam
       - id: wasmstore-dune-cache
         name: 'OCaml/Dune cache'
         uses: actions/cache@v3
         with:
-          key: wasmstore-dune-${{ matrix.ocaml-compiler }}-${{ matrix.os }}-${{ hashFiles('src/**') }}-${{ hashFiles('dune-project') }}
+          key: wasmstore-dune-${{ matrix.ocaml-compiler }}-${{ matrix.target }}-${{ matrix.os }}-${{ hashFiles('src/**') }}-${{ hashFiles('dune-project') }}
           path: _build
       - name: 'Use OCaml ${{ matrix.ocaml-compiler }}'
         uses: ocaml/setup-ocaml@v2
         with:
           ocaml-compiler: '${{ matrix.ocaml-compiler }}'
       - run: opam install . --deps-only -y
       - name: 'Make release'
-        run: opam exec -- make release
+        run: opam exec -- make release TARGET=${{ matrix.target }}
       - name: Upload Artifact to Release
         uses: softprops/action-gh-release@v1
         with:

diff --git a/Makefile b/Makefile
@@ -1,11 +1,11 @@
 PREFIX?=/usr/local
 VERSION=0.2
-UNAME_M:=$(shell uname -m)
+TARGET?=$(shell uname -m)
 UNAME_S:=$(shell uname -s | tr '[:upper:]' '[:lower:]')
 ifeq ($(UNAME_S),darwin)
 	UNAME_S=macos
 endif
-RELEASE_DIR=wasmstore-$(UNAME_M)-$(UNAME_S)-$(VERSION)
+RELEASE_DIR=wasmstore-$(TARGET)-$(UNAME_S)-$(VERSION)
 
 build:
 	dune build