Update git actions

firoorg · Feb 13, 2025 · 2790ba1 · 2790ba1
1 parent 609bc99
commit 2790ba1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/firodex-desktop-cd.yml b/.github/workflows/firodex-desktop-cd.yml
@@ -83,8 +83,8 @@ jobs:
           sudo make -j2 install
 
           # set clang version
-          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 100
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 100
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 100
 
           # cleanup
           sudo apt-get clean && \

diff --git a/.github/workflows/firodex-desktop-ci.yml b/.github/workflows/firodex-desktop-ci.yml
@@ -197,8 +197,8 @@ jobs:
       - name: Upload env variable for vpkg (Linux)
         if: runner.os == 'Linux'
         run: |
-          echo "CXX=clang++-18" >> $GITHUB_ENV
-          echo "CC=clang-18" >> $GITHUB_ENV
+          echo "CXX=clang++-20" >> $GITHUB_ENV
+          echo "CC=clang-20" >> $GITHUB_ENV
 
       - name: vcpkg deps (All)
         uses: lukka/run-vcpkg@v10
@@ -262,8 +262,8 @@ jobs:
           export PATH=$HOME/.nimble/bin:$PATH
           #export CXXFLAGS=-stdlib=libc++
           #export LDFLAGS=-stdlib=libc++
-          export CXX=clang++-18
-          export CC=clang-18
+          export CXX=clang++-20
+          export CC=clang-20
           cd ci_tools_atomic_dex
           nimble build -y
 
@@ -368,8 +368,8 @@ jobs:
           export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
           export PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/gcc_64/bin:$PATH
           export PATH=$HOME/.nimble/bin:$PATH
-          export CXX=clang++-18
-          export CC=clang-18
+          export CXX=clang++-20
+          export CC=clang-20
           #echo "Running tests"
           #./ci_tools_atomic_dex tests ${{ matrix.type }}
           #cd build-${{ matrix.type }}/bin/AntaraAtomicDexTestsAppDir/usr/bin

diff --git a/Dockerfile b/Dockerfile
@@ -82,8 +82,8 @@ RUN git config --global --add safe.directory /build/komodo-wallet-desktop
 RUN cd /build/komodo-wallet-desktop && ./ci_tools_atomic_dex/ci_scripts/linux_script_docker.sh
 
 
-ENV CXX=clang++-18
-ENV CC=clang-18
+ENV CXX=clang++-20
+ENV CC=clang-20
 #ENV CXXFLAGS="-stdlib=libc++ -std=c++20"
 #ENV LDFLAGS="-stdlib=libc++"
 

diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh
@@ -33,17 +33,17 @@ wget https://apt.llvm.org/llvm.sh
 chmod +x llvm.sh
 sudo ./llvm.sh 12
 # set clang version
-sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 777
-sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 777
+sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 777
+sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 777
 # set gnu compilers version
-sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 777
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 777
+sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 777
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 777
 sudo apt-get update
 sudo apt-get install libc++abi-11-dev libc++-11-dev -y
 #export CXXFLAGS=-stdlib=libc++
 #export LDFLAGS=-stdlib=libc++
-export CXX=clang++-18
-export CC=clang-18
+export CXX=clang++-20
+export CC=clang-20
 
 # get right cmake version
 wget https://github.com/Kitware/CMake/releases/download/v3.19.0-rc3/cmake-3.19.0-rc3-Linux-x86_64.tar.gz

diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script_docker.sh b/ci_tools_atomic_dex/ci_scripts/linux_script_docker.sh
@@ -12,19 +12,19 @@ chmod +x llvm.sh
 sudo ./llvm.sh 12
 
 # Set Clang as the default compiler
-sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 777
-sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 777
+sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 777
+sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 777
 
 # Set GCC/G++ 9 as the fallback compiler
-sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 777
-sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 777
+sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 777
+sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 777
 
 # Install libc++ for C++20 support
 sudo apt-get install -y libc++-11-dev libc++abi-11-dev
 
 # Set environment variables for Clang
-export CXX=clang++-18
-export CC=clang-18
+export CXX=clang++-20
+export CC=clang-20
 
 # Install CMake 3.27.1
 wget https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz

diff --git a/ci_tools_atomic_dex/linux_misc/Dockerfile b/ci_tools_atomic_dex/linux_misc/Dockerfile
@@ -7,18 +7,18 @@ RUN apt-get -y update && \
     apt-get -y upgrade && \
     apt-get install software-properties-common -y && \
     add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-    apt-get -y install build-essential libgl1-mesa-dev ninja-build curl wget zstd lsb-release libpulse-dev libtool autoconf unzip libssl-dev libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb1-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0 libgstreamer-plugins-base1.0-dev git zip unzip python3-pip python-pip wget gcc-9 g++-9 python-pyqt5 libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libfontconfig1-dev libxss-dev libxtst-dev libpci-dev libcap-dev libsrtp0-dev libasound2-dev libnspr4-dev libnss3-dev ninja-build -y && \
+    apt-get -y install build-essential libgl1-mesa-dev ninja-build curl wget zstd lsb-release libpulse-dev libtool autoconf unzip libssl-dev libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb1-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0 libgstreamer-plugins-base1.0-dev git zip unzip python3-pip python-pip wget gcc-14 g++-14 python-pyqt5 libssl-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libfontconfig1-dev libxss-dev libxtst-dev libpci-dev libcap-dev libsrtp0-dev libasound2-dev libnspr4-dev libnss3-dev ninja-build -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN wget https://apt.llvm.org/llvm.sh; chmod +x llvm.sh; ./llvm.sh 12; \
-    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 777; \
-    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 777; \
-    update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 777; \
-    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 777; \
+    update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 777; \
+    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 777; \
+    update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 777; \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 777; \
     apt-get update; \
-    export CXX=clang++-18; \
-    export CC=clang-18;
+    export CXX=clang++-20; \
+    export CC=clang-20;
 
 RUN wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.tar.gz; \
     tar xvf cmake-$CMAKE_VERSION-linux-x86_64.tar.gz; curdir=$(pwd); \