diff --git a/.gitmodules b/.gitmodules index f97f23bfd2d..c9c28250637 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "apps/projectGenerator"] path = apps/projectGenerator url = https://github.com/openframeworks/projectGenerator + branch = master [submodule "scripts/apothecary"] path = scripts/apothecary url = https://github.com/openframeworks/apothecary diff --git a/apps/projectGenerator b/apps/projectGenerator index 0d4e7c3c7cd..0d8b8d2707c 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit 0d4e7c3c7cd5ad48eae0ba4189887680bc9f847a +Subproject commit 0d8b8d2707cf16c805f5c40d42b9308227a6d54f diff --git a/scripts/apothecary b/scripts/apothecary index 313b213ede6..5c0f7bab40d 160000 --- a/scripts/apothecary +++ b/scripts/apothecary @@ -1 +1 @@ -Subproject commit 313b213ede658eb6ae3fa5c4fb21a7bdcbe2230a +Subproject commit 5c0f7bab40da5a59ef354c7135535566d4fcc225 diff --git a/scripts/ci/package_builds.sh b/scripts/ci/package_builds.sh index b1dad66d963..250807e3b3b 100755 --- a/scripts/ci/package_builds.sh +++ b/scripts/ci/package_builds.sh @@ -58,7 +58,7 @@ if [[ "$(uname -s)" == "Linux" ]]; then $ROOT/scripts/dev/create_package.sh msys2 $lastversion master ucrt64 $ROOT/scripts/dev/create_package.sh vs $lastversion master $ROOT/scripts/dev/create_package.sh vs $lastversion master 64 - $ROOT/scripts/dev/create_package.sh vs2019 $lastversion master 64 + # $ROOT/scripts/dev/create_package.sh vs2019 $lastversion master 64 fi $ROOT/scripts/dev/create_package.sh osx $lastversion master $ROOT/scripts/dev/create_package.sh ios $lastversion master diff --git a/scripts/ci/simulate_nightly.sh b/scripts/ci/simulate_nightly.sh index 9edaed045e4..c49762a3067 100755 --- a/scripts/ci/simulate_nightly.sh +++ b/scripts/ci/simulate_nightly.sh @@ -9,7 +9,7 @@ OF_ROOT=$SCRIPT_DIR/../../ # Define environment variables TARGET="linux64" LIBS="64gcc6" -RELEASE="nightly" # Set default release value +RELEASE="nightly" # Parse command line arguments while getopts "r:" opt; do @@ -28,24 +28,10 @@ echo "OF_ROOT: $OF_ROOT" echo "OF_SCRIPT_DIR: $OF_SCRIPT_DIR" if [[ "$(uname -s)" == "Linux" ]]; then -# Install libunwind -# echo "Installing libunwind..." -sudo apt-get update -sudo apt-get install -y libunwind-dev -sudo apt-get install -y npm -sudo apt-get install -y curl + sudo apt-get update + sudo apt-get install -y libunwind-dev npm curl fi -# Cache packages -# echo "Caching packages..." -# This part would require a custom implementation or external tool as caching -# packages is specific to GitHub Actions and not easily replicated in bash. - -# Checkout the repository (make sure the script is executed in a repository context) -# echo "Checking out the repository..." -# git checkout master - -# Run ccache (assumes ccache is installed and configured) echo "Running ccache..." ccache --show-stats @@ -54,8 +40,8 @@ echo "Installing dependencies..." $SCRIPT_DIR/$TARGET/install.sh # Update submodules -echo "Updating submodules..." -$OF_ROOT/scripts/dev/init_submodules.sh +# echo "Updating submodules..." +# $OF_ROOT/scripts/dev/init_submodules.sh # Download libraries echo "Downloading libraries..." diff --git a/scripts/dev/create_package.sh b/scripts/dev/create_package.sh index 05088c956c4..f1473093afc 100755 --- a/scripts/dev/create_package.sh +++ b/scripts/dev/create_package.sh @@ -11,7 +11,7 @@ platform=$1 version=$2 -all_platforms="linux linux64 linuxarmv6l linuxarmv7l linuxaarch64 osx msys2 vs vs2019 ios macos tvos android emscripten" +all_platforms="linux linux64 linuxarmv6l linuxarmv7l linuxaarch64 osx msys2 vs ios macos tvos android emscripten" of_root=$(readlink -f "$(dirname "$(readlink -f "$0")")/../..")