From e26fff8fdf6161875e568f45338661ec3e3308b2 Mon Sep 17 00:00:00 2001 From: andy5995 Date: Sun, 18 Feb 2024 08:04:07 -0600 Subject: [PATCH] CI-fix: pip install requirements --- .github/workflows/codeql.yml | 19 ++++++++++--------- .github/workflows/linux.yml | 5 +++-- README.md | 3 +++ meson.build | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 61c6495..db5ea6e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -5,10 +5,12 @@ on: branches: [ trunk ] paths: - '**.c' + - '**codeql.yml' pull_request: branches: [ trunk ] paths: - '**.c' + - '**codeql.yml' jobs: analyze: @@ -21,29 +23,28 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.9' - cache: 'pip' - name: Install Dependencies run: | sudo apt update - sudo apt install -y libgeany-dev + sudo apt install -y geany libgtk-3-dev pip install meson ninja - - name: Build Pinner - run: | - meson setup builddir - ninja -C builddir - - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: languages: 'cpp' # Use 'cpp' for C code analysis + - name: Build Pinner + run: | + meson setup builddir + ninja -C builddir + - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9f25843..c8baeec 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -10,12 +10,14 @@ on: paths: - '**.c' - 'meson.build' + - '**linux.yml' pull_request: branches: - trunk paths: - '**.c' - 'meson.build' + - '**linux.yml' jobs: build: @@ -33,7 +35,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: '3.9' - cache: 'pip' - name: Install Meson and Ninja run: pip install meson ninja @@ -41,7 +42,7 @@ jobs: - name: Install Dependencies run: | sudo apt update - sudo apt install -y libgeany-dev + sudo apt install -y geany libgtk-3-dev - name: Configure Build with Meson run: meson setup builddir diff --git a/README.md b/README.md index 34a27d0..23812f7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +[![Linux](https://github.com/andy5995/pinner/actions/workflows/linux.yml/badge.svg)](https://github.com/andy5995/pinner/actions/workflows/linux.yml) +[![CodeQL Analysis](https://github.com/andy5995/pinner/actions/workflows/codeql.yml/badge.svg)](https://github.com/andy5995/pinner/actions/workflows/codeql.yml) + # Pinner A [geany plugin](https://www.geany.org/support/plugins/) that enables pinning diff --git a/meson.build b/meson.build index 4a66a02..7846e1b 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project( 'pinner', ['c'], version: '0.1.0.999', - meson_version : '>= 0.48.0', + meson_version : '>= 0.50.0', default_options: [ 'warning_level=2', ]