Try ubuntu 24

node-3d · Dec 2, 2024 · 0d01e29 · 0d01e29
1 parent 3489021
commit 0d01e29
Showing 1 changed file with 35 additions and 36 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
 
   pack-binaries:
     machine:
-      image: ubuntu-2204:current
+      image: ubuntu-2404:current
     resource_class: arm.medium
     steps:
       - restore_cache:
@@ -25,58 +25,57 @@ jobs:
             echo "Qt 6.8.0 already installed."
           else
             echo "Downloading Qt 6.8.0."
-            python -m pip install setuptools aqtinstall
+            python3 -m pip install setuptools aqtinstall
             cd ~
-            python -m aqt install-qt --outputdir ~/Qt linux_arm64 desktop 6.8.0 linux_gcc_arm64
+            python3 -m aqt install-qt --outputdir ~/Qt linux_arm64 desktop 6.8.0 linux_gcc_arm64
           fi
       - save_cache:
           name: Save Qt Cache
           key: Qt-6.8.0-v3
           paths:
             - ../Qt
 
-      - run: ls
       - checkout
       - run: |
           mkdir -p ~/artifacts
           node -p "require('./package').version" > ~/artifacts/pkg-version
       - run: ~/Qt/6.8.0/gcc_arm64/bin/qmake -spec linux-aarch64-gnu-g++ src/qt/_qmlui.pro
 
-      - restore_cache:
-          name: Restore GLIBC Cache
-          key: glibc-2.35-v6
-      - run: |
-          if [ -d "/home/circleci/glibc" ]; then
-            echo "GLIBC 2.38 already cached."
-          else
-            echo "Building GLIBC 2.38 from source."
-            sudo apt-get -y install bison
-            cd ~
-            git clone --branch release/2.38/master --depth 1 https://sourceware.org/git/glibc.git
-            cd glibc
-            mkdir build
-            cd build
-            ../configure --disable-sanity-checks
-            make -j `nproc`
-            # ../configure --prefix "/home/circleci/glibc/build/install"
-            # make -j `nproc`
-            # sudo make install -j `nproc`
-          fi
-      - save_cache:
-          name: Save GLIBC Cache
-          key: glibc-2.35-v6
-          paths:
-            - ../glibc
+      # - restore_cache:
+      #     name: Restore GLIBC Cache
+      #     key: glibc-2.35-v6
+      # - run: |
+      #     if [ -d "/home/circleci/glibc" ]; then
+      #       echo "GLIBC 2.38 already cached."
+      #     else
+      #       echo "Building GLIBC 2.38 from source."
+      #       sudo apt-get -y install bison
+      #       cd ~
+      #       git clone --branch release/2.38/master --depth 1 https://sourceware.org/git/glibc.git
+      #       cd glibc
+      #       mkdir build
+      #       cd build
+      #       ../configure --disable-sanity-checks
+      #       make -j `nproc`
+      #       # ../configure --prefix "/home/circleci/glibc/build/install"
+      #       # make -j `nproc`
+      #       # sudo make install -j `nproc`
+      #     fi
+      # - save_cache:
+      #     name: Save GLIBC Cache
+      #     key: glibc-2.35-v6
+      #     paths:
+      #       - ../glibc
 
-      - run: |
-          export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
-          cd ~/glibc/build
-          sudo make install -j `nproc`
-          sudo ldconfig
+      # - run: |
+      #     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
+      #     cd ~/glibc/build
+      #     sudo make install -j `nproc`
+      #     sudo ldconfig
 
       - run: |
-          export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
-          LD_DEBUG=versions make
+          # export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
+          make
 
       - run: |
           mkdir -p ~/bin_tmp