Actions update - nightly

.github/workflows/manual-nightly.yml

@@ -27,7 +27,6 @@ jobs:
     runs-on: ubuntu-24.04
     # runs release manually for a TAG 
     if: github.repository == 'openframeworks/openframeworks' && startsWith(github.ref, 'refs/tags/')
-    #if: github.repository == 'openframeworks/openframeworks' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
     strategy:
         matrix:
           cfg:
@@ -39,16 +38,12 @@ jobs:
       run: |
         if [[ "${{ github.ref }}" == refs/tags/* ]]; then
           echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
-          echo "PRERELEASE=false" >> $GITHUB_ENV
         elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
           echo "RELEASE=nightly" >> $GITHUB_ENV
-          echo "PRERELEASE=false" >> $GITHUB_ENV
         elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
           echo "RELEASE=latest" >> $GITHUB_ENV
-          echo "PRERELEASE=true" >> $GITHUB_ENV
         else
           echo "RELEASE=latest" >> $GITHUB_ENV
-          echo "PRERELEASE=true" >> $GITHUB_ENV
         fi
     - name: Install libunwind
       run:  sudo apt-get install libunwind-dev    
@@ -85,7 +80,6 @@ jobs:
         path: out/manual-mega_artefact.tar.bz2
         retention-days: 1
     - name: Update Release arm64
-        if: github.repository == 'openframeworks/openframeworks' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
         uses: softprops/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/nightly-linux64.yml

@@ -50,16 +50,12 @@ jobs:
       run: |
         if [[ "${{ github.ref }}" == refs/tags/* ]]; then
           echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
-          echo "PRERELEASE=false" >> $GITHUB_ENV
         elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
           echo "RELEASE=nightly" >> $GITHUB_ENV
-          echo "PRERELEASE=false" >> $GITHUB_ENV
         elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
           echo "RELEASE=latest" >> $GITHUB_ENV
-          echo "PRERELEASE=true" >> $GITHUB_ENV
         else
           echo "RELEASE=latest" >> $GITHUB_ENV
-          echo "PRERELEASE=true" >> $GITHUB_ENV
         fi
     - name: Install libunwind
       run:  sudo apt-get install libunwind-dev    
@@ -95,7 +91,6 @@ jobs:
         path: out/nightly-mega_artefact.tar.bz2
         retention-days: 7
     - name: Update Release arm64
-        if: github.repository == 'openframeworks/openframeworks' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
         uses: softprops/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/of.yml

@@ -32,6 +32,19 @@ jobs:
     - uses: actions/checkout@v4
     - name: Docker Step
       run:  "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash"
+    - name: Determine Release
+      id: vars
+      shell: bash
+      run: |
+        if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+          echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+          echo "RELEASE=nightly" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        else
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        fi
     - name: Download libs
       run: ./scripts/$TARGET/download_libs.sh
     - name: Install dependencies
@@ -112,10 +125,23 @@ jobs:
           install: >-
             git
             unzip
+      - name: Determine Release
+        id: vars
+        shell: bash
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+            echo "RELEASE=nightly" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+            echo "RELEASE=latest" >> $GITHUB_ENV
+          else
+            echo "RELEASE=latest" >> $GITHUB_ENV
+          fi
       - name: Install dependencies
         shell: msys2 {0}
         run:
-          ./scripts/ci/vs/install_bleeding.sh
+          ./scripts/ci/vs/install.sh
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v2
       - name: Build DEBUG and RELEASE emptyExample
@@ -149,16 +175,26 @@ jobs:
       with:
         packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}}
         version: 1.0
-
     - uses: actions/checkout@v4
-
     - name: ccache
       uses: hendrikmuhs/[email protected]
       with:
         key: ${{ matrix.cfg.libs }}
-
+    - name: Determine Release
+      id: vars
+      shell: bash
+      run: |
+        if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+          echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+          echo "RELEASE=nightly" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        else
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        fi
     - name: Download libs
-      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
+      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}} -t $RELEASE; 
     - name: Install dependencies
       run: ./scripts/ci/linuxrpi/install.sh;
     - name: Build
@@ -182,9 +218,21 @@ jobs:
       uses: hendrikmuhs/[email protected]
       with:
         key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
-
+    - name: Determine Release
+      id: vars
+      shell: bash
+      run: |
+        if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+          echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+          echo "RELEASE=nightly" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        else
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        fi
     - name: Download libs
-      run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh
+      run: ./scripts/${{matrix.cfg.libs}}/download_libs.sh -t $RELEASE
     - name: install
       run: ./scripts/ci/$TARGET/install.sh
     - name: Build
@@ -214,15 +262,27 @@ jobs:
       with:
         packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 wget2 make libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good 
         version: 1.0
-
+    - name: Determine Release
+      id: vars
+      shell: bash
+      run: |
+        if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+          echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+          echo "RELEASE=nightly" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        else
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        fi
     - uses: actions/checkout@v4
     - name: ccache
       uses: hendrikmuhs/[email protected]
       with:
         key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
 
     - name: Download libs
-      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}};
+      run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}} -t $RELEASE;
     - name: Install dependencies
       run: ./scripts/ci/$TARGET/install.sh;
     - name: Build
@@ -289,9 +349,23 @@ jobs:
       with:
         key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}
 
+    - name: Determine Release
+      id: vars
+      shell: bash
+      run: |
+        if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+          echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+          echo "RELEASE=nightly" >> $GITHUB_ENV
+        elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        else
+          echo "RELEASE=latest" >> $GITHUB_ENV
+        fi
+
 
     - name: Download libs
-      run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh
+      run: ./scripts/${{ matrix.cfg.target }}/download_libs.sh -t $RELEASE
 
     - name: Build
       run:

scripts/ci/package_builds.sh

@@ -31,6 +31,8 @@ ls
 OUTPUT_FOLDER=$ROOT/out
 mkdir -p $OUTPUT_FOLDER
 
+RELEASE="${RELEASE:-latest}"
+
 lastversion=$(date +%Y%m%d)
 if [ -n "$1" ] && [ "$1" != "nightly" ]; then
 	lastversion=$1

scripts/ci/simulate_nightly.sh

@@ -59,7 +59,7 @@ $OF_ROOT/scripts/dev/init_submodules.sh
 
 # Download libraries
 echo "Downloading libraries..."
-$OF_ROOT/scripts/linux/download_libs.sh -a $LIBS
+$OF_ROOT/scripts/linux/download_libs.sh -a $LIBS -t $RELEASE
 
 # Create package
 echo "Creating package..."

scripts/ci/vs/install.sh

@@ -1,21 +1,59 @@
 OF_ROOT=$PWD
 
 SCRIPT_DIR="${BASH_SOURCE%/*}"
+
+RELEASE="${RELEASE:-nightly}"
+
 if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi
 . "$SCRIPT_DIR/../../dev/downloader.sh"
 
-${OF_ROOT}/scripts/vs/download_libs.sh -p vs --silent
+unset BITS
+cd "${OF_ROOT}"
+./scripts/vs/download_libs.sh -p vs --silent -t $RELEASE
 
-cd ~/
 rm -rf projectGenerator
-mkdir -p ~/projectGenerator
-cd ~/projectGenerator
+mkdir -p projectGenerator
+cd projectGenerator
+
+if [[ "$RELEASE" == "nightly" ]] || [[ "$RELEASE" == "latest" ]]; then
+  echo "Downloading nightly projectGenerator from Github Latest"
+  URL="https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip"
+else
+  echo "Downloading projectGenerator for release $RELEASE from Github"
+  URL="https://github.com/openframeworks/projectGenerator/releases/download/$RELEASE/projectGenerator-vs.zip"
+fi
 
 echo "Downloading projectGenerator from Github Nightly"
-downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip 2> /dev/null
+downloader $URL 2> /dev/null
 unzip projectGenerator-vs.zip 2> /dev/null
 rm projectGenerator-vs.zip
 
-cd $OF_ROOT
-PG_OF_PATH=$OF_ROOT ~/projectGenerator/projectGenerator.exe examples/templates/emptyExample
-PG_OF_PATH=$OF_ROOT ~/projectGenerator/projectGenerator.exe examples/templates/allAddonsExample
+cd "${OF_ROOT}"
+
+OFW_ROOT=$(cygpath -w "$PWD")
+PG_OFX_PATH="${OF_ROOT}\\projectGenerator\\projectGenerator.exe"
+PG_OF_PATH="${OF_ROOT}/projectGenerator/projectGenerator.exe"
+
+PGW_OFX_PATH=$(cygpath -w "$PG_OF_PATH")
+
+PROJECTS=(
+    "examples\\templates\\emptyExample"
+    "examples\\templates\\allAddonsExample"
+)
+
+ADDONS=(
+    ""
+    "ofxAssimpModelLoader,ofxGui,ofxKinect,ofxNetwork,ofxOpenCv,ofxOsc,ofxSvg,ofxThreadedImageLoader,ofxXmlSettings"
+)
+
+echo "Updating projects with PG at:${PG_OF_PATH}"
+
+for i in "${!PROJECTS[@]}"; do
+    PROJECT=${PROJECTS[i]}
+    ADDON=${ADDONS[i]}
+    OPTIONS="-o\"${OF_ROOT}\" -v -a\"$ADDON\" -p\"vs\"  -t\"\" \"${OF_ROOT}\\${PROJECT}\""
+    # Run the project generator executable with the combined options
+    echo "Updating: ${PROJECT} with:${PG_OF_PATH}"
+    #cmd.exe /c "${PG_OF_PATH} ${OPTIONS}"
+    eval "${PG_OF_PATH} ${OPTIONS}"
+done