diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index add672c..705a4de 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -38,5 +38,8 @@ jobs: run: | export SVER=`cat VERSION` export GH=`git log -1 --format=%h` - STOCHAS_VERSION="${SVER}.${GH}" ./scripts/${{ matrix.build_script }} + STOCHAS_VERSION="${SVER}" ./scripts/${{ matrix.build_script }} + + - name: Show built product + run: ls product diff --git a/.gitignore b/.gitignore index c845150..999311c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ build.install/ *.code-search CMakeUserPresets.json ignore/* +product/* diff --git a/scripts/linux-build.sh b/scripts/linux-build.sh index 2ec2e6f..462454b 100755 --- a/scripts/linux-build.sh +++ b/scripts/linux-build.sh @@ -10,4 +10,7 @@ mkdir -p ignore/build/Stochas/Standalone cp -r ignore/build/stochas_artefacts/VST3/* build/Stochas cp -r ignore/build/stochas_artefacts/CLAP/* build/Stochas cp -r ignore/build/stochas_artefacts/Standalone/* build/Stochas/Standalone -tar cvzf "ignore/build/product/${NM}" -C ignore/build Stochas \ No newline at end of file +tar cvzf "ignore/build/product/${NM}" -C ignore/build Stochas + +mkdir product +mv ignore/build/product/* product \ No newline at end of file diff --git a/scripts/mac-build.sh b/scripts/mac-build.sh index 0e37eed..ab973ac 100755 --- a/scripts/mac-build.sh +++ b/scripts/mac-build.sh @@ -22,5 +22,8 @@ cp -r ignore/build_au/stochas_artefacts/AU/* ignore/mac_assets mkdir -p ignore/mac_installer lib/sst-plugininfra/scripts/installer_mac/make_installer.sh Stochas ignore/mac_assets resources ignore/mac_installer ${STOCHAS_VERSION} + +mkdir product +mv ignore/mac_installer/*dmg product diff --git a/scripts/win-build.sh b/scripts/win-build.sh index da063ce..28a0f75 100644 --- a/scripts/win-build.sh +++ b/scripts/win-build.sh @@ -18,3 +18,6 @@ ls build/product nuget install innosetup mkdir -p build/product/ iscc //Obuild\\product //Fstochas_windows_installer //DSTOCHAS_VERSION=${STOCHAS_VERSION}.${GH} "install\\win\\install.iss" + +mkdir -p product +mv build/product/* product