Skip to content

Commit

Permalink
Nightly Build Fix (#8256)
Browse files Browse the repository at this point in the history
* Submodule fixes.

(cherry picked from commit 42b9ddd)

* Package Nightly fixes

(cherry picked from commit 53578e9)

* Updates nightly

(cherry picked from commit 57685a2)

* Simulate Nightly

(cherry picked from commit 972dae5)
  • Loading branch information
danoli3 authored Jan 15, 2025
1 parent 0a40b45 commit 25eb8ff
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/apothecary
Submodule apothecary updated 154 files
2 changes: 1 addition & 1 deletion scripts/ci/package_builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 5 additions & 19 deletions scripts/ci/simulate_nightly.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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..."
Expand Down
2 changes: 1 addition & 1 deletion scripts/dev/create_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")")/../..")

Expand Down

0 comments on commit 25eb8ff

Please sign in to comment.