Skip to content

macOS build action fix #624

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.

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 13 commits into from
Mar 13, 2025
Merged
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
48 changes: 48 additions & 0 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
@@ -85,13 +85,45 @@ jobs:
pwd
ls

- name: Build and Package projectGenerator Linux GUI
shell: bash
run: |
cd ../openFrameworks/apps/projectGenerator/frontend
npm install
npm update
npm run dist:linux:arm64
cd dist
pwd
ls

- name: Build and Package projectGenerator Linux GUI
shell: bash
run: |
cd ../openFrameworks/apps/projectGenerator/frontend
npm install
npm update
npm run dist:linux:armv7l
cd dist
pwd
ls

- name: List output frontend dist dir
run: ls -lah ./../openFrameworks/apps/projectGenerator/frontend/dist

- name: Copy GUI tarball to root directory
run: |
cd ./../openFrameworks/apps/projectGenerator/frontend/dist
mv projectGenerator-0.95.0.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-gui.gz

- name: Copy GUI tarball to root directory
run: |
cd ./../openFrameworks/apps/projectGenerator/frontend/dist
mv projectGenerator-0.95.0-arm64.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-arm64-gui.gz

- name: Copy GUI tarball to root directory
run: |
cd ./../openFrameworks/apps/projectGenerator/frontend/dist
mv projectGenerator-0.95.0-armv7l.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-armv7l-gui.gz

- name: Test Artefact zip
run: |
@@ -118,3 +150,19 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
files: projectGenerator-linux-gui.gz

- name: Update Release Linux gui - 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: projectGenerator-linux-arm64-gui.gz

- name: Update Release Linux gui - armv7l
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: projectGenerator-linux-armv7l-gui.gz
26 changes: 25 additions & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
@@ -63,6 +63,25 @@ jobs:
- name: Setup CI setup environment / checkout oF
run: |
./scripts/osx/ci_install_core.sh

- name: List Repository Structure
run: |
echo "GITHUB_WORKSPACE is: $GITHUB_WORKSPACE"
ls -lah $GITHUB_WORKSPACE

- name: build_cmdline.sh
run: |
echo "Current directory: $(pwd)"
echo "Listing repository root:"
ls -lah ..
echo "Changing directory to openFrameworks..."
cd ../openFrameworks
echo "Now in: $(pwd)"
echo "Listing apps/projectGenerator/:"
ls -lah apps/projectGenerator/

echo "Executing build_cmdline.sh:"
./apps/projectGenerator/scripts/osx/build_cmdline.sh
- name: Build PG macOS GUI and command line
run: |
# Move up one level to projectGenerator directory
@@ -116,6 +135,11 @@ jobs:
else
echo "projectGenerator-osx.zip NOT found at level 0"
fi
if [ -f "projectGenerator-osx-arm64.zip" ]; then
echo "projectGenerator-osx-arm64.zip found at level 0"
else
echo "projectGenerator-osx-arm64.zip NOT found at level 0"
fi
- name: Test cmdline
run: ../openFrameworks/apps/projectGenerator/scripts/osx/test_cmdline.sh

@@ -125,7 +149,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
tag_name: ${{ env.RELEASE }}
files: dist/projectGenerator-mac-arm64.zip
files: 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
2 changes: 2 additions & 0 deletions commandLine/Project.xcconfig
Original file line number Diff line number Diff line change
@@ -70,6 +70,8 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME)

HIGH_RESOLUTION_CAPABLE = NO

CONFIGURATION_BUILD_DIR = ${SRCROOT}/bin

// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
#include? "App.xcconfig"

Loading