ubuntu 22

cipig · Aug 21, 2024 · e4aee66 · e4aee66
1 parent df3d569
commit e4aee66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -194,8 +194,8 @@ jobs:
       - name: Upload env variable for vpkg (Linux)
         if: runner.os == 'Linux'
         run: |
-          echo "CXX=clang++-12" >> $GITHUB_ENV
-          echo "CC=clang-12" >> $GITHUB_ENV
+          echo "CXX=clang++" >> $GITHUB_ENV
+          echo "CC=clang" >> $GITHUB_ENV
 
       - name: vcpkg deps (All)
         uses: lukka/run-vcpkg@v11
@@ -237,8 +237,8 @@ jobs:
           export PATH=$HOME/.nimble/bin:$PATH
           #export CXXFLAGS=-stdlib=libc++
           #export LDFLAGS=-stdlib=libc++
-          #export CXX=clang++-12
-          #export CC=clang-12
+          export CXX=clang++
+          export CC=clang
           cd ci_tools_atomic_dex
           nimble build -y
 
@@ -349,8 +349,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++-12
-          export CC=clang-12
+          export CXX=clang++
+          export CC=clang
           #echo "Running tests"
           #./ci_tools_atomic_dex tests ${{ matrix.type }}
           #cd build-${{ matrix.type }}/bin/AntaraAtomicDexTestsAppDir/usr/bin

diff --git a/ci_tools_atomic_dex/ci_scripts/linux_script.sh b/ci_tools_atomic_dex/ci_scripts/linux_script.sh
@@ -52,7 +52,6 @@ sudo apt-get update
 #sudo cp -r * /usr/local/
 cmake --version
 clang --version
-tar --version
 
 # get libwally
 git clone https://github.com/KomodoPlatform/libwally-core.git --recurse-submodules
@@ -62,12 +61,3 @@ cd libwally-core
 sudo make -j3 install
 cd ..
 
-## tar
-wget --timeout=10 --tries=3 https://ftp.gnu.org/gnu/tar/tar-1.32.tar.gz || wget --timeout=10 --tries=3 https://mirrors.sjtug.sjtu.edu.cn/gnu/tar/tar-1.32.tar.gz
-tar xvf tar-1.32.tar.gz
-cd tar-1.32
-export FORCE_UNSAFE_CONFIGURE=1
-./configure
-sudo make -j install
-sudo ln -s /bin/tar /usr/local/bin/tar
-sudo update-alternatives --install /usr/bin/tar tar /usr/local/bin/tar 777