Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
- name: Copy GUI tarball to root directory
run: |
cd ./../openFrameworks/apps/projectGenerator/frontend/dist
mv projectGenerator-0.67.0.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-gui.gz
mv projectGenerator-0.95.0.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-gui.gz

- name: Test Artefact zip
run: |
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,11 @@ jobs:
./scripts/osx/ci_install_core.sh
- name: Build PG macOS GUI and command line
run: |
# echo "Current directory after moving up: (should be projectGenerator/projectGenerator)"
# pwd
# Move up one level to projectGenerator directory
cd ../

# echo "Current directory after moving up: (should be projectGenerator/)"
# echo "------------------"
# pwd
# ls
# echo "------------------"
if [ -f "openFrameworks/apps/projectGenerator/scripts/osx/ci_build_pg.sh" ]; then
echo "ci_build_pg.sh exists, running script..."
openFrameworks/apps/projectGenerator/scripts/osx/ci_build_pg.sh

else
echo "ci_build_pg.sh does not exist, checking Git status..."
if cd openFrameworks/apps/projectGenerator; then
Expand Down Expand Up @@ -124,8 +116,16 @@ jobs:
else
echo "projectGenerator-osx.zip NOT found at level 0"
fi
- name: Test cmdline
- name: Test cmdline
run: ../openFrameworks/apps/projectGenerator/scripts/osx/test_cmdline.sh

- name: Update Release macOS-arm64
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
files: dist/projectGenerator-mac-arm64.zip
- name: Update Release macOS
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
uses: softprops/action-gh-release@v2.0.8
Expand Down
2 changes: 1 addition & 1 deletion commandLine/src/defines.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define OFPROJECTGENERATOR_MAJOR_VERSION "0"
#define OFPROJECTGENERATOR_MINOR_VERSION "94"
#define OFPROJECTGENERATOR_MINOR_VERSION "95"
#define OFPROJECTGENERATOR_PATCH_VERSION "0"

#define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION)
Expand Down
Loading