Skip to content

Commit 9200fbb

Browse files
committed
GHA Apple - Fix artifact management
1 parent e7b1b81 commit 9200fbb

File tree

1 file changed

+25
-9
lines changed

1 file changed

+25
-9
lines changed

.github/workflows/apple.yml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,10 @@ jobs:
127127
APPLE_NOTARIZE_USERNAME: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
128128
APPLE_NOTARIZE_PASSWORD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
129129
run: |
130-
set -x
131130
# Get the version number from the framework's Info.plist
132-
VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" install/Frameworks/lsl.framework/Versions/A/Resources/Info.plist)
133-
echo "LSL_VERSION=$VERSION" >> $GITHUB_ENV
134-
echo $VERSION
135-
echo $LSL_VERSION
131+
LSL_VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" install/Frameworks/lsl.framework/Versions/A/Resources/Info.plist)
132+
echo "LSL_VERSION=$LSL_VERSION" >> $GITHUB_ENV
133+
echo "Debug: LSL_VERSION=$LSL_VERSION"
136134
137135
mkdir -p package
138136
productbuild --sign "$APPLE_CODE_SIGN_IDENTITY_INST" \
@@ -154,13 +152,27 @@ jobs:
154152
name: dumps-${{ matrix.config.name }}
155153
path: dumps
156154

157-
- name: upload install dir
155+
- name: Zip LSL Framework
156+
run: |
157+
cd install/Frameworks
158+
zip -r lsl.framework.zip lsl.framework
159+
cd ../..
160+
161+
- name: Upload macOS Package and Framework
162+
if: matrix.config.name == 'macOS-latest'
158163
uses: actions/upload-artifact@v4
159164
with:
160-
name: build-${{ matrix.config.name }}
165+
name: build-macOS-latest
161166
path: |
162-
install
163167
package/*.pkg
168+
install/Frameworks/lsl.framework.zip
169+
170+
- name: Upload iOS Framework
171+
if: matrix.config.name == 'iOS'
172+
uses: actions/upload-artifact@v4
173+
with:
174+
name: build-iOS
175+
path: install/Frameworks/lsl.framework.zip
164176

165177
package_and_deploy:
166178
name: Package and Deploy
@@ -177,6 +189,10 @@ jobs:
177189
name: build-iOS
178190
path: build-iOS
179191

192+
- name: Unzip macOS Framework
193+
run: |
194+
unzip build-macOS-latest/lsl.framework.zip -d build-macOS-latest/Frameworks
195+
180196
- name: Unzip iOS Framework
181197
run: |
182198
unzip build-iOS/lsl.framework.zip -d build-iOS/Frameworks
@@ -188,7 +204,7 @@ jobs:
188204
APPLE_NOTARIZE_PASSWORD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
189205
run: |
190206
xcodebuild -create-xcframework \
191-
-framework build-macOS-latest/install/Frameworks/lsl.framework \
207+
-framework build-macOS-latest/Frameworks/lsl.framework \
192208
-framework build-iOS/Frameworks/lsl.framework \
193209
-output lsl.xcframework
194210

0 commit comments

Comments
 (0)