commit dabcf1f0d83c8f323191a2f341930173cec64510 parent f6de9792ed7efe3111bad564d061d11540a4e18d Author: Matt Demanett <matt@demanett.net> Date: Sun, 28 Nov 2021 14:22:50 -0500 Try to get on-push compilation check github action working with rack2. Diffstat:
6 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/.github/actions/build_linux/Dockerfile b/.github/actions/build_linux/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:16.04 RUN apt-get update -RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq +RUN apt-get install -y build-essential gcc g++ git make tar zip unzip gdb curl cmake libx11-dev libglu1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev zlib1g-dev libasound2-dev libgtk2.0-dev libgtk-3-dev libjack-jackd2-dev jq zstd libpulse-dev ADD entrypoint.sh /entrypoint.sh RUN chmod a+x /entrypoint.sh diff --git a/.github/actions/build_linux/entrypoint.sh b/.github/actions/build_linux/entrypoint.sh @@ -5,7 +5,7 @@ set -eu export RACK_DIR=${GITHUB_WORKSPACE}/Rack-SDK export RACK_USER_DIR=${GITHUB_WORKSPACE} -curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip +curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-lin.zip -o rack-sdk.zip unzip -o rack-sdk.zip rm rack-sdk.zip diff --git a/.github/actions/build_osx/entrypoint.sh b/.github/actions/build_osx/entrypoint.sh @@ -9,7 +9,7 @@ export CC=x86_64-apple-darwin15-clang export CXX=x86_64-apple-darwin15-clang++ export STRIP=x86_64-apple-darwin15-strip -curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip +curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-mac.zip -o rack-sdk.zip unzip -o rack-sdk.zip rm rack-sdk.zip diff --git a/.github/actions/build_win/Dockerfile b/.github/actions/build_win/Dockerfile @@ -1,7 +1,7 @@ FROM debian:stretch RUN apt-get update -RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq g++-mingw-w64-x86-64 +RUN apt-get install -y gcc g++ g++-mingw-w64-x86-64 git make tar zip unzip gdb curl cmake libx11-dev libglu1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev zlib1g-dev libasound2-dev libgtk2.0-dev libgtk-3-dev libjack-jackd2-dev jq zstd libpulse-dev ADD entrypoint.sh /entrypoint.sh RUN chmod a+x /entrypoint.sh diff --git a/.github/actions/build_win/entrypoint.sh b/.github/actions/build_win/entrypoint.sh @@ -9,7 +9,7 @@ export CC=x86_64-w64-mingw32-gcc-posix export CXX=x86_64-w64-mingw32-g++-posix export STRIP=x86_64-w64-mingw32-strip -curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip +curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-win.zip -o rack-sdk.zip unzip -o rack-sdk.zip rm rack-sdk.zip diff --git a/.github/workflows/buildDevelop.yml b/.github/workflows/buildDevelop.yml @@ -2,9 +2,10 @@ on: push: branches: - master + - build_scripts_test name: Develop env: - RACK_SDK_VERSION: 1.1.6 + RACK_SDK_VERSION: 2.beta.1 jobs: buildLinux: name: Build Linux @@ -13,3 +14,10 @@ jobs: - uses: actions/checkout@master - name: Build Linux uses: ./.github/actions/build_linux + buildWindows: + name: Build Windows + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Build Windows + uses: ./.github/actions/build_win