Merge branch 'master' into merge-mining

This commit is contained in:
SChernykh 2024-01-26 18:56:22 +01:00
commit 7a0a8b94fe
8 changed files with 57 additions and 57 deletions

View file

@ -35,7 +35,7 @@ jobs:
apk add git cmake gcc g++ make
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -102,7 +102,7 @@ jobs:
file p2pool
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-alpine-static-${{ matrix.config.arch }}
path: build/p2pool
@ -127,7 +127,7 @@ jobs:
sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev ${{ matrix.config.c }} ${{ matrix.config.cpp }}
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -158,7 +158,7 @@ jobs:
./p2pool_tests
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-${{ matrix.config.os }}
path: build/p2pool
@ -182,7 +182,7 @@ jobs:
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12 --slave /usr/bin/gcov gcov /usr/bin/gcov-12
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -236,7 +236,7 @@ jobs:
./p2pool_tests
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-ubuntu-static-libs
path: build/p2pool
@ -259,7 +259,7 @@ jobs:
sudo apt install -y git build-essential cmake gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu qemu-user
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -313,7 +313,7 @@ jobs:
qemu-aarch64 -L /usr/aarch64-linux-gnu ./p2pool_tests
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-${{ matrix.config.os }}-aarch64
path: build/p2pool
@ -335,7 +335,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -395,7 +395,7 @@ jobs:
./p2pool_tests.exe
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-msys2-${{ matrix.config.c }}.exe
path: build/p2pool.exe
@ -414,7 +414,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -459,7 +459,7 @@ jobs:
./p2pool_tests.exe
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-vs-${{ matrix.config.os }}-randomx-${{ matrix.config.rx }}-upnp-${{ matrix.config.upnp }}.exe
path: build/Release/p2pool.exe
@ -471,7 +471,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -525,7 +525,7 @@ jobs:
./p2pool_tests
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-macos-11
path: build/p2pool
@ -537,7 +537,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -572,7 +572,7 @@ jobs:
make -j3
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-macos-11-aarch64
path: build/p2pool
@ -592,7 +592,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -635,7 +635,7 @@ jobs:
./p2pool_tests
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-${{ matrix.os.name }}-${{ matrix.os.version }}
path: build/p2pool
@ -655,7 +655,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -679,7 +679,7 @@ jobs:
./p2pool_tests
- name: Archive binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool-${{ matrix.os.name }}-${{ matrix.os.version }}
path: build/p2pool

View file

@ -18,12 +18,12 @@ jobs:
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 17
sudo apt-get install -y clang-tidy-17
clang-tidy-17 --verify-config
sudo ./llvm.sh 18
sudo apt-get install -y clang-tidy-18
clang-tidy-18 --verify-config
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -31,9 +31,9 @@ jobs:
run: |
mkdir build
cd build
cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-17 -DCMAKE_CXX_COMPILER=clang++-17 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON
cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON
- name: Run clang-tidy
run: |
cd src
clang-tidy-17 *.cpp -p ../build -checks=-clang-diagnostic-undefined-internal,-clang-analyzer-optin.performance.Padding -warnings-as-errors=* -header-filter=^[^\.]
clang-tidy-18 *.cpp -p ../build -checks=-clang-diagnostic-undefined-internal,-clang-analyzer-optin.performance.Padding,-clang-diagnostic-nan-infinity-disabled -warnings-as-errors=* -header-filter=^[^\.]

View file

@ -47,13 +47,13 @@ jobs:
sudo apt update && sudo apt install git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@ -64,7 +64,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3
# Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
@ -78,4 +78,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

View file

@ -20,12 +20,12 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Checkout cppcheck
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: danmar/cppcheck
path: cppcheck-main
@ -48,7 +48,7 @@ jobs:
./run.sh
- name: Archive full error list
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: errors_full-linux
path: cppcheck/errors_full.txt
@ -66,12 +66,12 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
- name: Checkout cppcheck
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: danmar/cppcheck
path: cppcheck-main
@ -96,7 +96,7 @@ jobs:
./run.cmd
- name: Archive full error list
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: errors_full-windows
path: cppcheck/errors_full.txt

View file

@ -33,7 +33,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -45,7 +45,7 @@ jobs:
# run: cmake --build ${{ env.build }}
- name: Initialize MSVC Code Analysis
uses: microsoft/msvc-code-analysis-action@24c285ab36952c9e9182f4b78dfafbac38a7e5ee
uses: microsoft/msvc-code-analysis-action@96315324a485db21449515180214ecb78c16a1c5
# Provide a unique ID to access the sarif output path
id: run-analysis
with:
@ -56,13 +56,13 @@ jobs:
# Upload SARIF file to GitHub Code Scanning Alerts
- name: Upload SARIF to GitHub
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: ${{ steps.run-analysis.outputs.sarif }}
# Upload SARIF file as an Artifact to download and view
- name: Upload SARIF as an Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sarif-file
path: ${{ steps.run-analysis.outputs.sarif }}

View file

@ -8,7 +8,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -18,7 +18,7 @@ jobs:
XZ_OPT=-e9 tar --exclude=".git" --exclude="build" -f build/p2pool_source.tar.xz -c ../p2pool --xz
- name: Archive source code
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool_source.tar.xz
path: build/p2pool_source.tar.xz

View file

@ -23,7 +23,7 @@ jobs:
sudo apt install -y git build-essential cmake gcc-12 g++-12
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -75,7 +75,7 @@ jobs:
grep 'Synchronization finished successfully' p2pool.log
- name: Archive p2pool.log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool_ubuntu_data_tsan
path: |
@ -111,7 +111,7 @@ jobs:
cp -r lib /tmp/libcxx_msan
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -163,7 +163,7 @@ jobs:
grep 'Synchronization finished successfully' p2pool.log
- name: Archive p2pool.log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool_ubuntu_data_msan
path: |
@ -183,7 +183,7 @@ jobs:
sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -212,7 +212,7 @@ jobs:
grep 'Synchronization finished successfully' p2pool.log
- name: Archive p2pool.log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool_ubuntu_data_ubsan
path: |
@ -232,7 +232,7 @@ jobs:
sudo apt install -y git build-essential cmake libuv1-dev libzmq3-dev libsodium-dev libpgm-dev libnorm-dev libgss-dev libcurl4-openssl-dev libidn2-0-dev gcc-12 g++-12
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true
@ -261,7 +261,7 @@ jobs:
grep 'Synchronization finished successfully' p2pool.log
- name: Archive p2pool.log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool_ubuntu_data_asan
path: |
@ -275,7 +275,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -332,7 +332,7 @@ jobs:
grep 'Synchronization finished successfully' p2pool.log
- name: Archive p2pool.log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool_macos_data
path: |
@ -346,7 +346,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -380,7 +380,7 @@ jobs:
findstr /C:"Synchronization finished successfully" p2pool.log
- name: Archive p2pool.log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool_windows_data_debug_asan
path: |
@ -394,7 +394,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
@ -426,7 +426,7 @@ jobs:
findstr /C:"Synchronization finished successfully" p2pool.log
- name: Archive p2pool.log
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: p2pool_windows_data_leaks
path: |

View file

@ -1,3 +1,3 @@
npyscreen==4.10.5
MarkupSafe==2.0.1
jinja2==2.11.3
jinja2==3.1.3