Skip to content

Commit ee84600

Browse files
committed
fix: correct paths for Swift modules and libraries in CI workflows
1 parent d0d1ca8 commit ee84600

File tree

2 files changed

+28
-11
lines changed

2 files changed

+28
-11
lines changed

.github/workflows/build-release.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,20 +142,33 @@ jobs:
142142
VERSION=${{ steps.version.outputs.version }}
143143
PACKAGE_NAME="SwiftIR-${VERSION}-linux-x86_64"
144144
145-
mkdir -p ${PACKAGE_NAME}/{lib,include,bin,share}
145+
mkdir -p ${PACKAGE_NAME}/{lib,include,bin,share,swift-modules}
146+
147+
# Set the correct build directory path
148+
BUILD_DIR=".build/x86_64-unknown-linux-gnu/release"
146149
147150
# Copy SwiftIR libraries
148151
echo "Copying SwiftIR libraries..."
149-
cp -v .build/release/*.so ${PACKAGE_NAME}/lib/ 2>/dev/null || true
152+
cp -v ${BUILD_DIR}/*.so ${PACKAGE_NAME}/lib/ 2>/dev/null || true
153+
cp -v ${BUILD_DIR}/*.a ${PACKAGE_NAME}/lib/ 2>/dev/null || true
150154
151-
# Copy Swift modules
155+
# Copy Swift modules (they are files in $BUILD_DIR/Modules/)
152156
echo "Copying Swift modules..."
157+
mkdir -p ${PACKAGE_NAME}/swift-modules
153158
for module in SwiftIR SwiftIRCore SwiftIRTypes SwiftIRDialects SwiftIRBuilders SwiftIRXLA SwiftIRStableHLO SwiftIRRuntime; do
154-
if [ -d ".build/release/${module}.swiftmodule" ]; then
155-
cp -r .build/release/${module}.swiftmodule ${PACKAGE_NAME}/include/
159+
if [ -f "${BUILD_DIR}/Modules/${module}.swiftmodule" ]; then
160+
cp -v "${BUILD_DIR}/Modules/${module}.swiftmodule" ${PACKAGE_NAME}/swift-modules/
161+
echo " ✅ Copied ${module}.swiftmodule"
162+
else
163+
echo " ⚠️ Not found: ${module}.swiftmodule"
156164
fi
157165
done
158166
167+
# Debug: show what modules are available
168+
echo ""
169+
echo "Available modules in build directory:"
170+
ls -la "${BUILD_DIR}/Modules/"*.swiftmodule 2>/dev/null | head -20 || echo "No .swiftmodule files found"
171+
159172
# Copy essential runtime dependencies
160173
echo "Copying runtime dependencies..."
161174
cp -v /opt/swiftir-deps/lib/pjrt_c_api_cpu_plugin.so ${PACKAGE_NAME}/lib/ 2>/dev/null || true

.github/workflows/ubuntu-build-dependencies.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -420,17 +420,21 @@ jobs:
420420
echo "Copying Swift modules..."
421421
BUILD_DIR=".build/x86_64-unknown-linux-gnu/release"
422422
423-
# Copy all SwiftIR modules
423+
# Copy all SwiftIR modules (they are files in $BUILD_DIR/Modules/)
424424
for module in SwiftIR SwiftIRCore SwiftIRTypes SwiftIRDialects SwiftIRBuilders SwiftIRXLA SwiftIRStableHLO SwiftIRRuntime; do
425-
if [ -d "$BUILD_DIR/Modules/${module}.swiftmodule" ]; then
426-
cp -r "$BUILD_DIR/Modules/${module}.swiftmodule" /opt/swiftir-deps/swift-modules/
427-
echo " ✅ Copied ${module}.swiftmodule"
428-
elif [ -f "$BUILD_DIR/${module}.swiftmodule" ]; then
429-
cp "$BUILD_DIR/${module}.swiftmodule" /opt/swiftir-deps/swift-modules/
425+
if [ -f "$BUILD_DIR/Modules/${module}.swiftmodule" ]; then
426+
cp "$BUILD_DIR/Modules/${module}.swiftmodule" /opt/swiftir-deps/swift-modules/
430427
echo " ✅ Copied ${module}.swiftmodule"
428+
else
429+
echo " ⚠️ Not found: ${module}.swiftmodule"
431430
fi
432431
done
433432
433+
# Debug: show what's in the Modules directory
434+
echo ""
435+
echo "Available modules in build directory:"
436+
ls -la "$BUILD_DIR/Modules/"*.swiftmodule 2>/dev/null | head -20 || echo "No .swiftmodule files found"
437+
434438
# Also copy any .swiftinterface files
435439
find "$BUILD_DIR" -name "*.swiftinterface" -exec cp {} /opt/swiftir-deps/swift-modules/ \; 2>/dev/null || true
436440

0 commit comments

Comments
 (0)