brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Force build

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-05-20 20:11:45 +02:00
parent aa90be8d60
commit f74e57370d
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -35,7 +35,6 @@ jobs:
src/Rack/dep/jansson-2.12 src/Rack/dep/jansson-2.12
src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libarchive-3.4.3
src/Rack/dep/libsamplerate-0.1.9 src/Rack/dep/libsamplerate-0.1.9
src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
src/Rack/dep/zstd-1.4.5 src/Rack/dep/zstd-1.4.5
key: linux-${{ matrix.target }}-v${{ env.CACHE_VERSION }} key: linux-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess - name: Fix GitHub's mess
@ -191,9 +190,11 @@ jobs:
src/Rack/dep/jansson-2.12 src/Rack/dep/jansson-2.12
src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libarchive-3.4.3
src/Rack/dep/libsamplerate-0.1.9 src/Rack/dep/libsamplerate-0.1.9
src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
src/Rack/dep/zstd-1.4.5 src/Rack/dep/zstd-1.4.5
key: macos-${{ matrix.target }}-v${{ env.CACHE_VERSION }} key: macos-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
- name: Setup dependencies
run: |
brew install autoconf
- name: Build extra dependencies - name: Build extra dependencies
run: | run: |
export PATH="/usr/local/opt/ccache/libexec:${PATH}" export PATH="/usr/local/opt/ccache/libexec:${PATH}"
@ -325,7 +326,6 @@ jobs:
src/Rack/dep/jansson-2.12 src/Rack/dep/jansson-2.12
src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libarchive-3.4.3
src/Rack/dep/libsamplerate-0.1.9 src/Rack/dep/libsamplerate-0.1.9
src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
src/Rack/dep/zstd-1.4.5 src/Rack/dep/zstd-1.4.5
key: wasm-${{ matrix.target }}-v${{ env.CACHE_VERSION }} key: wasm-${{ matrix.target }}-v${{ env.CACHE_VERSION }}
- name: Set up dependencies - name: Set up dependencies
@ -421,7 +421,6 @@ jobs:
src/Rack/dep/jansson-2.12 src/Rack/dep/jansson-2.12
src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libarchive-3.4.3
src/Rack/dep/libsamplerate-0.1.9 src/Rack/dep/libsamplerate-0.1.9
src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
src/Rack/dep/zstd-1.4.5 src/Rack/dep/zstd-1.4.5
key: ${{ matrix.target }}-v${{ env.CACHE_VERSION }} key: ${{ matrix.target }}-v${{ env.CACHE_VERSION }}
- name: Fix GitHub's mess - name: Fix GitHub's mess
@ -606,7 +605,6 @@ jobs:
src/Rack/dep/jansson-2.12 src/Rack/dep/jansson-2.12
src/Rack/dep/libarchive-3.4.3 src/Rack/dep/libarchive-3.4.3
src/Rack/dep/libsamplerate-0.1.9 src/Rack/dep/libsamplerate-0.1.9
src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
src/Rack/dep/zstd-1.4.5 src/Rack/dep/zstd-1.4.5
key: pluginval-v${{ env.CACHE_VERSION }} key: pluginval-v${{ env.CACHE_VERSION }}
- name: Set up dependencies - name: Set up dependencies

9
deps/Makefile vendored
View file

@ -12,15 +12,16 @@ include $(ROOT)/Makefile.base.mk
ifeq ($(CPU_ARM32),true) ifeq ($(CPU_ARM32),true)
ARCH_NAME = arm ARCH_NAME = arm
MACHINE = i686-the-rack MACHINE = arm64
else ifeq ($(CPU_ARM64),true) else ifeq ($(CPU_ARM64),true)
ARCH_NAME = arm64 ARCH_NAME = arm64
MACHINE = x86_64-the-rack MACHINE = arm64
else ifeq ($(CPU_RISCV64),true) else ifeq ($(CPU_RISCV64),true)
ARCH_NAME = riscv64 ARCH_NAME = riscv64
MACHINE = x86_64-the-rack MACHINE = arm64
else ifeq ($(WASM),true) else ifeq ($(WASM),true)
MACHINE = i686-wasm ARCH_NAME = wasm
MACHINE = x86_64
else else
MACHINE = $(TARGET_MACHINE) MACHINE = $(TARGET_MACHINE)
endif endif