Skip to content

ci fixes - projectGenerator download fix for vs #8044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 12, 2024
Merged

ci fixes - projectGenerator download fix for vs #8044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cee08b0
ci fixes projectGenerator download. pg set to put command line in roo…
danoli3 Jul 12, 2024
26b7bb6
vs ci fix
danoli3 Jul 12, 2024
017dd5c
missing pipes
danoli3 Jul 12, 2024
9b278fe
ill figure it out later
danoli3 Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/of.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,14 @@ jobs:
./scripts/ci/vs/install_bleeding.sh
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2
# - name: Build emptyExample
# working-directory: ${{env.GITHUB_WORKSPACE}}
# run:
# msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
# - name: Build allAddonsExample
# working-directory: ${{env.GITHUB_WORKSPACE}}
# run:
# msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
- name: Build DEBUG emptyExample
working-directory: ${{env.GITHUB_WORKSPACE}}
run:
msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
- name: Build DEBUG allAddonsExample
working-directory: ${{env.GITHUB_WORKSPACE}}
run:
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
# - name: Build DEBUG allAddonsExample
# working-directory: ${{env.GITHUB_WORKSPACE}}
# run:
# msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143


# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down
32 changes: 22 additions & 10 deletions scripts/ci/vs/install_bleeding.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,34 @@ if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi

unset BITS

${OF_ROOT}/scripts/vs/download_latest_libs.sh -p vs --silent
cd ${OF_ROOT}
./scripts/vs/download_latest_libs.sh -p vs --silent

cd ~/
rm -rf projectGenerator
mkdir -p ~/projectGenerator
cd ~/projectGenerator
mkdir -p projectGenerator
cd projectGenerator

echo "Downloading projectGenerator from Github Bleeding"
downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip 2> /dev/null
unzip projectGenerator-vs.zip 2> /dev/null
rm projectGenerator-vs.zip
ls
cd ../

downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs-gui.zip 2> /dev/null
unzip projectGenerator-vs-gui.zip 2> /dev/null
rm projectGenerator-vs-gui.zip
# downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs-gui.zip 2> /dev/null
# unzip projectGenerator-vs-gui.zip 2> /dev/null
# rm projectGenerator-vs-gui.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
PG_OF_PATH=$OF_ROOT/projectGenerator/projectGenerator.exe

PROJECTS=(
"examples/templates/emptyExample"
"examples/templates/allAddonsExample"
)

for PROJECT in "${PROJECTS[@]}"; do
OPTIONS="-o\"$OF_ROOT\" \"$OF_ROOT/$PROJECT\""
# Run the project generator executable with the combined options
eval "$PG_OF_PATH $OPTIONS"
#"$PG_OF_PATH" -o"$OF_ROOT" "$OF_ROOT/$PROJECT"
done
5 changes: 5 additions & 0 deletions scripts/dev/download_pg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,21 @@ if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then
if ! command -v rsync &> /dev/null
then
cp -ar ${OUTPUT}/ ${OUTDIR}/projectGenerator
cp -ar ${OUTDIR}/projectGenerator/resources/app/projectGenerator.exe ${OUTDIR}/projectGenerator/projectGeneratorCMD.exe
else
rsync -a ${OUTPUT}/ ${OUTDIR}/projectGenerator
rsync -a ${OUTDIR}/projectGenerator/resources/app/projectGenerator.exe ${OUTDIR}/projectGenerator/projectGeneratorCMD.exe
fi
rm -rf $OUTPUT

else
if ! command -v rsync &> /dev/null
then
cp -ar $OUTPUT/projectGenerator$EXT $OUTDIR/projectGenerator
cp -ar projectGenerator/projectGenerator.app/Contents/MacOS/projectGenerator projectGenerator
else
rsync -a $OUTPUT/projectGenerator$EXT $OUTDIR/projectGenerator
rsync -a projectGenerator/projectGenerator.app/Contents/MacOS/projectGenerator projectGenerator
fi
rm -rf $OUTPUT/projectGenerator$EXT

Expand Down