diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml index a1c7428e3f8..f13709c86d4 100644 --- a/.github/codeql/codeql-config.yml +++ b/.github/codeql/codeql-config.yml @@ -6,3 +6,5 @@ paths-ignore: - dist.* - node_modules - python/grass/pygrass/tests +queries: + - uses: security-extended diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ceee1dfe399..fadba2398fd 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -28,10 +28,13 @@ jobs: strategy: fail-fast: false matrix: - language: - - c-cpp - - python - - actions + include: + - language: c-cpp + build-mode: none + - language: python + build-mode: none + - language: actions + build-mode: none concurrency: group: ${{ github.workflow }}-${{ @@ -49,7 +52,7 @@ jobs: with: python-version: "3.x" - name: Install non-Python dependencies - if: ${{ matrix.language == 'c-cpp' }} + if: ${{ matrix.language == 'c-cpp' && false }} run: | sudo apt-get update -y sudo apt-get install -y wget git gawk findutils @@ -65,6 +68,7 @@ jobs: with: languages: ${{ matrix.language }} config-file: ./.github/codeql/codeql-config.yml + build-mode: ${{ matrix.build-mode }} - name: Create installation directory run: | @@ -79,7 +83,7 @@ jobs: echo "MAKEFLAGS=-j$(nproc)" >> "${GITHUB_ENV}" - name: Build - if: ${{ matrix.language == 'c-cpp' }} + if: ${{ matrix.language == 'c-cpp' && false }} env: CFLAGS: -std=gnu17 CXXFLAGS: -std=c++17 diff --git a/raster3d/r3.showdspf/draw_cappolys_ogl.c b/raster3d/r3.showdspf/draw_cappolys_ogl.c index 489d771a604..38988d7ae0f 100644 --- a/raster3d/r3.showdspf/draw_cappolys_ogl.c +++ b/raster3d/r3.showdspf/draw_cappolys_ogl.c @@ -66,7 +66,7 @@ int index; norm[0] = norm[2] = 0.0; for (t = start; t != stop; t += direction) { tmpvt[t][0] = (vertices[t << 1] + xloc) * D_spec->xscale; - tmpvt[t][1] = (D_Cap->z) * D_spec->yscale; + tmpvt[t][1] = ((double) D_Cap->z) * D_spec->yscale; tmpvt[t][2] = (vertices[(t << 1) + 1] + yloc) * D_spec->zscale; } break;