From c8054a7fa891394a7f7e64171ad66a93c36af2a0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 2 Jan 2025 00:00:13 -0500 Subject: [PATCH 1/2] .github/workflows/codeql: update actions, containers, fix error bash is needed for some scripts codeql runs --- .github/workflows/codeql.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index 8f43a3585..85a1a09e0 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -21,20 +21,22 @@ jobs: contents: read security-events: write container: - image: ghcr.io/void-linux/void-glibc-full:20230830r1 + image: ghcr.io/void-linux/void-glibc-full:20240526R1 steps: - name: Prepare container run: | - xbps-install -Syu || xbps-install -yu xbps + xbps-install -Syu xbps + xbps-install -yu # node-based actions require libstdc++.so.6 + # codeql runs some bash scripts xbps-install -Sy \ - libstdc++ git \ + libstdc++ bash git \ gcc make pkg-config zlib-devel openssl-devel libarchive-devel - name: Checkout repository uses: actions/checkout@v3 - run: git config --global --add safe.directory $(pwd) - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: cpp config-file: ./.github/codeql/codeql-config.yaml @@ -43,6 +45,6 @@ jobs: ./configure make -j - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:cpp" From 4d1814f73a0f4a512e86d24af1f50669d7bafbee Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 29 Dec 2024 14:42:50 -0500 Subject: [PATCH 2/2] bin/xbps-dgraph: print usage if package is not given fixes: #614 --- bin/xbps-dgraph/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/xbps-dgraph/main.c b/bin/xbps-dgraph/main.c index 5f6eee08e..92404e67d 100644 --- a/bin/xbps-dgraph/main.c +++ b/bin/xbps-dgraph/main.c @@ -594,6 +594,10 @@ main(int argc, char **argv) /* NOTREACHED */ } pkg = *argv; + if (!pkg) { + usage(true); + /* NOTREACHED */ + } /* Initialize libxbps */ memset(&xh, 0, sizeof(xh));