Skip to content

Commit 25eb8ff

Browse files
authored
Nightly Build Fix (#8256)
* 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)
1 parent 0a40b45 commit 25eb8ff

File tree

6 files changed

+10
-23
lines changed

6 files changed

+10
-23
lines changed

.gitmodules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[submodule "apps/projectGenerator"]
22
path = apps/projectGenerator
33
url = https://github.com/openframeworks/projectGenerator
4+
branch = master
45
[submodule "scripts/apothecary"]
56
path = scripts/apothecary
67
url = https://github.com/openframeworks/apothecary

scripts/apothecary

Submodule apothecary updated 154 files

scripts/ci/package_builds.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if [[ "$(uname -s)" == "Linux" ]]; then
5858
$ROOT/scripts/dev/create_package.sh msys2 $lastversion master ucrt64
5959
$ROOT/scripts/dev/create_package.sh vs $lastversion master
6060
$ROOT/scripts/dev/create_package.sh vs $lastversion master 64
61-
$ROOT/scripts/dev/create_package.sh vs2019 $lastversion master 64
61+
# $ROOT/scripts/dev/create_package.sh vs2019 $lastversion master 64
6262
fi
6363
$ROOT/scripts/dev/create_package.sh osx $lastversion master
6464
$ROOT/scripts/dev/create_package.sh ios $lastversion master

scripts/ci/simulate_nightly.sh

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ OF_ROOT=$SCRIPT_DIR/../../
99
# Define environment variables
1010
TARGET="linux64"
1111
LIBS="64gcc6"
12-
RELEASE="nightly" # Set default release value
12+
RELEASE="nightly"
1313

1414
# Parse command line arguments
1515
while getopts "r:" opt; do
@@ -28,24 +28,10 @@ echo "OF_ROOT: $OF_ROOT"
2828
echo "OF_SCRIPT_DIR: $OF_SCRIPT_DIR"
2929

3030
if [[ "$(uname -s)" == "Linux" ]]; then
31-
# Install libunwind
32-
# echo "Installing libunwind..."
33-
sudo apt-get update
34-
sudo apt-get install -y libunwind-dev
35-
sudo apt-get install -y npm
36-
sudo apt-get install -y curl
31+
sudo apt-get update
32+
sudo apt-get install -y libunwind-dev npm curl
3733
fi
3834

39-
# Cache packages
40-
# echo "Caching packages..."
41-
# This part would require a custom implementation or external tool as caching
42-
# packages is specific to GitHub Actions and not easily replicated in bash.
43-
44-
# Checkout the repository (make sure the script is executed in a repository context)
45-
# echo "Checking out the repository..."
46-
# git checkout master
47-
48-
# Run ccache (assumes ccache is installed and configured)
4935
echo "Running ccache..."
5036
ccache --show-stats
5137

@@ -54,8 +40,8 @@ echo "Installing dependencies..."
5440
$SCRIPT_DIR/$TARGET/install.sh
5541

5642
# Update submodules
57-
echo "Updating submodules..."
58-
$OF_ROOT/scripts/dev/init_submodules.sh
43+
# echo "Updating submodules..."
44+
# $OF_ROOT/scripts/dev/init_submodules.sh
5945

6046
# Download libraries
6147
echo "Downloading libraries..."

scripts/dev/create_package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
platform=$1
1212
version=$2
1313

14-
all_platforms="linux linux64 linuxarmv6l linuxarmv7l linuxaarch64 osx msys2 vs vs2019 ios macos tvos android emscripten"
14+
all_platforms="linux linux64 linuxarmv6l linuxarmv7l linuxaarch64 osx msys2 vs ios macos tvos android emscripten"
1515

1616
of_root=$(readlink -f "$(dirname "$(readlink -f "$0")")/../..")
1717

0 commit comments

Comments
 (0)