Try circle ci 23

node-3d · Nov 22, 2024 · 29f477d · 29f477d
1 parent ff50df7
commit 29f477d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,7 +21,7 @@ jobs:
       - run: cd ~ && python -m aqt install-qt --outputdir ~/Qt linux_arm64 desktop 6.8.0 linux_gcc_arm64
       - checkout
       - run: mkdir -p ~/artifacts
-      - run: node -p "'version='+require('./package').version" > ~/artifacts/pkg-version
+      - run: node -p "require('./package').version" > ~/artifacts/pkg-version
       - run: chmod +x src/qt-mkdir.sh && src/qt-mkdir.sh ~/qt_tmp
       - run: chmod +x src/qt-copy-linux.sh && src/qt-copy-linux.sh ~/qt_tmp ~/Qt/6.8.0/gcc_arm64
       - run: cd ~/qt_tmp && tar -czf ../aarch64.gz *

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -92,13 +92,6 @@ jobs:
           chmod +x src/qt-copy-linux.sh
           src/qt-copy-linux.sh ${{ env.QT_TMP }} ${{ github.workspace }}/../Qt/6.8.0/gcc_64
 
-      - name: Copy Qt Dir - Linux ARM
-        if: matrix.os != 'ubuntu-22.04' && matrix.os != 'macos-14' && matrix.os != 'windows-2022'
-        run: |
-          echo "OS_NAME=aarch64" >> $GITHUB_ENV
-          chmod +x src/qt-copy-linux.sh
-          src/qt-copy-linux.sh ${{ env.QT_TMP }} /home/opc/6.8.0/gcc_arm64
-
       - name: Copy Qt Dir - MacOS ARM
         if: matrix.os == 'macos-14'
         run: |

diff --git a/src/qt-copy-linux.sh b/src/qt-copy-linux.sh
@@ -1,28 +1,28 @@
 # $1 is tmp path - ${{ github.workspace }}/../__tmp
-# $2 is Qt platform path - /home/opc/6.8.0/gcc_arm64
+# $2 is Qt platform path - e.g.: ~/Qt/6.8.0/gcc_arm64
 
 # QML
-cp $2/lib/libQt6QmlMeta.so.6 $1/libQt6QmlMeta.so.6
+cp $2/lib/libQt6Qml.so.6 $1/libQt6Qml.so.6
 cp $2/lib/libQt6QmlMeta.so.6 $1/libQt6QmlMeta.so.6
 cp $2/lib/libQt6Quick.so.6 $1/libQt6Quick.so.6
 cp $2/lib/libQt6QuickControls2.so.6 $1/libQt6QuickControls2.so.6
 cp $2/lib/libQt6QuickTemplates2.so.6 $1/libQt6QuickTemplates2.so.6
 cp $2/lib/libQt6QuickWidgets.so.6 $1/libQt6QuickWidgets.so.6
 
-cp $2/lib/libQt6QuickVectorImage.so.6 $1/qml/libQt6QuickVectorImage.so.6
-cp $2/lib/libQt6QmlCompiler.so.6 $1/qml/libQt6QmlCompiler.so.6
-cp $2/lib/libQt6QmlCore.so.6 $1/qml/libQt6QmlCore.so.6
-cp $2/lib/libQt6QuickControls2Basic.so.6 $1/qml/libQt6QuickControls2Basic.so.6
-cp $2/lib/libQt6QuickControls2Impl.so.6 $1/qml/libQt6QuickControls2Impl.so.6
-cp $2/lib/libQt6QuickDialogs2.so.6 $1/qml/libQt6QuickDialogs2.so.6
-cp $2/lib/libQt6QuickDialogs2QuickImpl.so.6 $1/qml/libQt6QuickDialogs2QuickImpl.so.6
-cp $2/lib/libQt6QuickDialogs2Utils.so.6 $1/qml/libQt6QuickDialogs2Utils.so.6
-cp $2/lib/libQt6QuickEffects.so.6 $1/qml/libQt6QuickEffects.so.6
-cp $2/lib/libQt6QuickLayouts.so.6 $1/qml/libQt6QuickLayouts.so.6
-cp $2/lib/libQt6QuickParticles.so.6 $1/qml/libQt6QuickParticles.so.6
-cp $2/lib/libQt6QuickShapes.so.6 $1/qml/libQt6QuickShapes.so.6
-cp $2/lib/libQt6QmlWorkerScript.so.6 $1/qml/libQt6QmlWorkerScript.so.6
-cp $2/lib/libQt6QmlModels.so.6 $1/qml/libQt6QmlModels.so.6
+cp $2/lib/libQt6QuickVectorImage.so.6 $1/libQt6QuickVectorImage.so.6
+cp $2/lib/libQt6QmlCompiler.so.6 $1/libQt6QmlCompiler.so.6
+cp $2/lib/libQt6QmlCore.so.6 $1/libQt6QmlCore.so.6
+cp $2/lib/libQt6QuickControls2Basic.so.6 $1/libQt6QuickControls2Basic.so.6
+cp $2/lib/libQt6QuickControls2Impl.so.6 $1/libQt6QuickControls2Impl.so.6
+cp $2/lib/libQt6QuickDialogs2.so.6 $1/libQt6QuickDialogs2.so.6
+cp $2/lib/libQt6QuickDialogs2QuickImpl.so.6 $1/libQt6QuickDialogs2QuickImpl.so.6
+cp $2/lib/libQt6QuickDialogs2Utils.so.6 $1/libQt6QuickDialogs2Utils.so.6
+cp $2/lib/libQt6QuickEffects.so.6 $1/libQt6QuickEffects.so.6
+cp $2/lib/libQt6QuickLayouts.so.6 $1/libQt6QuickLayouts.so.6
+cp $2/lib/libQt6QuickParticles.so.6 $1/libQt6QuickParticles.so.6
+cp $2/lib/libQt6QuickShapes.so.6 $1/libQt6QuickShapes.so.6
+cp $2/lib/libQt6QmlWorkerScript.so.6 $1/libQt6QmlWorkerScript.so.6
+cp $2/lib/libQt6QmlModels.so.6 $1/libQt6QmlModels.so.6
 
 cp $2/plugins/qmltooling/libqmldbg_debugger.so $1/plugins/qmltooling/libqmldbg_debugger.so
 cp $2/plugins/qmltooling/libqmldbg_inspector.so $1/plugins/qmltooling/libqmldbg_inspector.so

diff --git a/src/qt-copy-macos.sh b/src/qt-copy-macos.sh
@@ -1,5 +1,5 @@
 # $1 is tmp path - ${{ github.workspace }}/../__tmp
-# $2 is Qt platform path - /home/opc/6.8.0/gcc_arm64
+# $2 is Qt platform path - e.g.: ~/Qt/6.8.0/macos
 
 # QML
 mkdir -p $1/QtQml.framework

diff --git a/src/qt-copy-windows.sh b/src/qt-copy-windows.sh
@@ -1,5 +1,5 @@
 # $1 is tmp path - ${{ github.workspace }}/../__tmp
-# $2 is Qt platform path - /home/opc/6.8.0/gcc_arm64
+# $2 is Qt platform path - e.g.: ~/Qt/6.8.0/msvc2022_64
 
 # QML
 cp $2/bin/Qt6Qml.dll $1/Qt6Qml.dll