From e9ce4feed43ff8aee482ebf09dc2446ba2e207d6 Mon Sep 17 00:00:00 2001 From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:23:19 +0200 Subject: [PATCH] Update CI --- .github/workflows/master.yml | 70 +++++++----------------------------- 1 file changed, 12 insertions(+), 58 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e775974278..2b02bb2bcd 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -1,4 +1,4 @@ -name: Build XMRig for Windows and Ubuntu +name: Build XMRig for Ubuntu on: push: @@ -9,56 +9,6 @@ on: - master jobs: - build-windows: - runs-on: windows-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: '14' - - - name: Set up MSYS2 - uses: msys2/setup-msys2@v2 - with: - msystem: MINGW64 - install: >- - mingw-w64-x86_64-gcc - git - make - - - name: Install Chocolatey - run: | - Set-ExecutionPolicy Bypass -Scope Process -Force; ` - [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; ` - iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - - - name: Install CMake - shell: msys2 {0} - run: choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' --yes - - - name: Create build directory - run: mkdir build - working-directory: xmrig - - - name: Configure CMake - shell: msys2 {0} - run: cmake.exe .. -G "Unix Makefiles" -DXMRIG_DEPS=c:/xmrig-deps/gcc/x64 - working-directory: xmrig/build - - - name: Build XMRig - run: make -j$(nproc) - working-directory: xmrig/build - - - name: Archive build - uses: actions/upload-artifact@v4 - with: - name: xmrig-windows - path: xmrig/build/xmrig.exe - build-ubuntu: runs-on: ubuntu-latest @@ -68,24 +18,28 @@ jobs: - name: Install dependencies run: | - sudo apt-get update - sudo apt-get install -y \ + sudo apt update + sudo apt install -y \ git \ build-essential \ cmake \ - libuv1-dev \ - libssl-dev \ - libhwloc-dev + automake \ + libtool \ + autoconf - name: Create build directory run: mkdir build + - name: Build dependencies + run: ./build_deps.sh + working-directory: scripts + - name: Configure CMake - run: cmake -DCMAKE_BUILD_TYPE=Release .. + run: cmake .. -DXMRIG_DEPS=scripts/deps working-directory: build - name: Build XMRig - run: make + run: make -j$(nproc) working-directory: build - name: Archive build