diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16e9331..89c1b27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,27 +25,22 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - - name: Install macOS autogen prerequisites - run: brew install autoconf automake - if: ${{ runner.os == 'macOS' }} - - name: ./autogen.sh - run: ./autogen.sh - name: Compiler version run: $CC -v env: CC: ${{ matrix.compiler }} - name: Install Linux dependencies - run: sudo apt install autoconf libssl-dev libpcap-dev libnet1-dev libjson-c-dev + run: sudo apt install cmake ninja-build libssl-dev libpcap-dev libnet1-dev libjson-c-dev if: ${{ runner.os == 'Linux' }} - name: Install macOS dependencies run: | - brew install openssl@3 libpcap libnet json-c + brew install cmake ninja openssl@3 libpcap libnet json-c echo "LDFLAGS=-L$(brew --prefix openssl@3)/lib" >> $GITHUB_ENV echo "CPPFLAGS=-I$(brew --prefix openssl@3)/include" >> $GITHUB_ENV if: ${{ runner.os == 'macOS' }} - - name: ./configure - run: ./configure + - name: cmake -B ${{github.workspace}}/build -G Ninja + run: cmake -B ${{github.workspace}}/build -G Ninja env: CC: ${{ matrix.compiler }} - - name: make - run: make + - name: ninja -C ${{github.workspace}}/build + run: ninja -C ${{github.workspace}}/build diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2cd3a79..3aec2a5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,10 +31,9 @@ jobs: languages: ${{ matrix.language }} - name: Build Application using script run: | - ./autogen.sh - sudo apt install autoconf libssl-dev libpcap-dev libnet1-dev libjson-c-dev - ./configure - make + sudo apt install cmake ninja-build libssl-dev libpcap-dev libnet1-dev libjson-c-dev + cmake -B ${{github.workspace}}/build -G Ninja + ninja -C ${{github.workspace}}/build - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 with: