Skip to content

Commit 7a33faa

Browse files
authored
macOS build action fix (#624)
* macOS actions * test package * build macos path * actions location * ci_build_pg osx - fix up line spaces, logs, check final git hash * ci install osx fix * base dir * macOS Actions * paths * likely depth issue * config * linux build other targets * upload linux arm64, linux armv7l, macos arm64
1 parent 6d24c15 commit 7a33faa

File tree

5 files changed

+307
-200
lines changed

5 files changed

+307
-200
lines changed

.github/workflows/build-linux.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,45 @@ jobs:
8585
pwd
8686
ls
8787
88+
- name: Build and Package projectGenerator Linux GUI
89+
shell: bash
90+
run: |
91+
cd ../openFrameworks/apps/projectGenerator/frontend
92+
npm install
93+
npm update
94+
npm run dist:linux:arm64
95+
cd dist
96+
pwd
97+
ls
98+
99+
- name: Build and Package projectGenerator Linux GUI
100+
shell: bash
101+
run: |
102+
cd ../openFrameworks/apps/projectGenerator/frontend
103+
npm install
104+
npm update
105+
npm run dist:linux:armv7l
106+
cd dist
107+
pwd
108+
ls
109+
88110
- name: List output frontend dist dir
89111
run: ls -lah ./../openFrameworks/apps/projectGenerator/frontend/dist
90112

91113
- name: Copy GUI tarball to root directory
92114
run: |
93115
cd ./../openFrameworks/apps/projectGenerator/frontend/dist
94116
mv projectGenerator-0.95.0.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-gui.gz
117+
118+
- name: Copy GUI tarball to root directory
119+
run: |
120+
cd ./../openFrameworks/apps/projectGenerator/frontend/dist
121+
mv projectGenerator-0.95.0-arm64.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-arm64-gui.gz
122+
123+
- name: Copy GUI tarball to root directory
124+
run: |
125+
cd ./../openFrameworks/apps/projectGenerator/frontend/dist
126+
mv projectGenerator-0.95.0-armv7l.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-armv7l-gui.gz
95127
96128
- name: Test Artefact zip
97129
run: |
@@ -118,3 +150,19 @@ jobs:
118150
token: ${{ secrets.GITHUB_TOKEN }}
119151
tag_name: ${{ env.RELEASE }}
120152
files: projectGenerator-linux-gui.gz
153+
154+
- name: Update Release Linux gui - arm64
155+
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
156+
uses: softprops/[email protected]
157+
with:
158+
token: ${{ secrets.GITHUB_TOKEN }}
159+
tag_name: ${{ env.RELEASE }}
160+
files: projectGenerator-linux-arm64-gui.gz
161+
162+
- name: Update Release Linux gui - armv7l
163+
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
164+
uses: softprops/[email protected]
165+
with:
166+
token: ${{ secrets.GITHUB_TOKEN }}
167+
tag_name: ${{ env.RELEASE }}
168+
files: projectGenerator-linux-armv7l-gui.gz

.github/workflows/build-macos.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,25 @@ jobs:
6363
- name: Setup CI setup environment / checkout oF
6464
run: |
6565
./scripts/osx/ci_install_core.sh
66+
67+
- name: List Repository Structure
68+
run: |
69+
echo "GITHUB_WORKSPACE is: $GITHUB_WORKSPACE"
70+
ls -lah $GITHUB_WORKSPACE
71+
72+
- name: build_cmdline.sh
73+
run: |
74+
echo "Current directory: $(pwd)"
75+
echo "Listing repository root:"
76+
ls -lah ..
77+
echo "Changing directory to openFrameworks..."
78+
cd ../openFrameworks
79+
echo "Now in: $(pwd)"
80+
echo "Listing apps/projectGenerator/:"
81+
ls -lah apps/projectGenerator/
82+
83+
echo "Executing build_cmdline.sh:"
84+
./apps/projectGenerator/scripts/osx/build_cmdline.sh
6685
- name: Build PG macOS GUI and command line
6786
run: |
6887
# Move up one level to projectGenerator directory
@@ -116,6 +135,11 @@ jobs:
116135
else
117136
echo "projectGenerator-osx.zip NOT found at level 0"
118137
fi
138+
if [ -f "projectGenerator-osx-arm64.zip" ]; then
139+
echo "projectGenerator-osx-arm64.zip found at level 0"
140+
else
141+
echo "projectGenerator-osx-arm64.zip NOT found at level 0"
142+
fi
119143
- name: Test cmdline
120144
run: ../openFrameworks/apps/projectGenerator/scripts/osx/test_cmdline.sh
121145

@@ -125,7 +149,7 @@ jobs:
125149
with:
126150
token: ${{ secrets.GITHUB_TOKEN }}
127151
tag_name: ${{ env.RELEASE }}
128-
files: dist/projectGenerator-mac-arm64.zip
152+
files: projectGenerator-mac-arm64.zip
129153
- name: Update Release macOS
130154
if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
131155
uses: softprops/[email protected]

commandLine/Project.xcconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME)
7070

7171
HIGH_RESOLUTION_CAPABLE = NO
7272

73+
CONFIGURATION_BUILD_DIR = ${SRCROOT}/bin
74+
7375
// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY.
7476
#include? "App.xcconfig"
7577

0 commit comments

Comments
 (0)