Configure SAST in .gitlab-ci.yml, creating this file if it does not already exist

2021-11-14 17:36:34 +00:00
7 changed files with 37 additions and 35 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,34 +1,41 @@
+# You can override the included template(s) by including variable overrides
+# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
+# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
+# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
+# Note that environment variables can be set in several places
+# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
 stages:
-  - build
-  - test
-  - release
-
+- build
+- test
+- release
 variables:
-  DEBIAN_FRONTEND: 'noninteractive'
-
+  DEBIAN_FRONTEND: noninteractive
 job-build:
  stage: build
  image: ubuntu:rolling
  script:
-    - sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
-    - apt-get update
-    - apt-get build-dep -y tint2
-    - apt-get install -y libgtk-3-dev git
-    - git clean -ffdx
-    - mkdir build
-    - cd build
-    - cmake ..
-    - make -j
-
+  - sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list
+  - apt-get update
+  - apt-get build-dep -y tint2
+  - apt-get install -y libgtk-3-dev git
+  - git clean -ffdx
+  - mkdir build
+  - cd build
+  - cmake ..
+  - make -j
 job-release:
  stage: release
  image: registry.gitlab.com/gitlab-org/release-cli:latest
  rules:
-    - if: $CI_COMMIT_TAG =~ /^v.*/
+  - if: "$CI_COMMIT_TAG =~ /^v.*/"
  script:
-    - echo 'running release_job'
+  - echo 'running release_job'
  release:
-    name: 'Release $CI_COMMIT_TAG'
-    description: 'Release $CI_COMMIT_TAG / $CI_COMMIT_SHA'
-    tag_name: '$CI_COMMIT_TAG'
-    ref: '$CI_COMMIT_SHA'
+    name: Release $CI_COMMIT_TAG
+    description: Release $CI_COMMIT_TAG / $CI_COMMIT_SHA
+    tag_name: "$CI_COMMIT_TAG"
+    ref: "$CI_COMMIT_SHA"
+sast:
+  stage: test
+include:
+- template: Security/SAST.gitlab-ci.yml
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -286,9 +286,6 @@ add_dependencies( tint2 version )
 set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=${CSTD} ${ASAN_C_FLAGS} ${TRACING_C_FLAGS}" )
 set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}  ${TRACING_L_FLAGS}" )

-add_executable(tint2-send src/tint2-send/tint2-send.c)
-target_link_libraries(tint2-send ${X11_LIBRARIES})
-
 install( TARGETS tint2 DESTINATION bin )
 install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )
 install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
--- a/4
+++ b/4
@@ -1,6 +1,4 @@
-2021-12-04 17.0.2
- Fixes:
-  - On dual monitor, when minimizing Chrome window it minimizes on the wrong monitor panel (issue #818)
+2021-10-14 master
 2021-05-29 17.0.1
 - Fixes:
  - Crash on panel cleanup in single-monitor execp (issue #801)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Latest stable release: 17.0.2
-Changes: https://gitlab.com/o9000/tint2/blob/17.0.2/ChangeLog
+# Latest stable release: 17.0.1
+Changes: https://gitlab.com/o9000/tint2/blob/17.0.1/ChangeLog

 Documentation: [doc/tint2.md](doc/tint2.md)

@@ -8,7 +8,7 @@ Compile it with (after you install the [dependencies](https://gitlab.com/o9000/t
 ```
 git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 17.0.2
+git checkout 17.0.1
 mkdir build
 cd build
 cmake ..
--- a/doc/readme.html
+++ b/doc/readme.html
@@ -199,9 +199,9 @@ pre {
 </style>
 </head>
 <body>
-<h1 id="latest-stable-release-17-0-2"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">17.0.2</span><a name="latest-stable-release-17-0-2" href="#latest-stable-release-17-0-2" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/17.0.2/ChangeLog">https://gitlab.com/o9000/tint2/blob/17.0.2/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><div class="highlight"><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
+<h1 id="latest-stable-release-17-0-1"><span class="md2man-title">Latest</span> <span class="md2man-section">stable</span> <span class="md2man-date">release:</span> <span class="md2man-source">17.0.1</span><a name="latest-stable-release-17-0-1" href="#latest-stable-release-17-0-1" class="md2man-permalink" title="permalink"></a></h1><p>Changes: <a href="https://gitlab.com/o9000/tint2/blob/17.0.1/ChangeLog">https://gitlab.com/o9000/tint2/blob/17.0.1/ChangeLog</a></p><p>Documentation: <a href="manual.html">manual.html</a></p><p>Compile it with (after you install the <a href="https://gitlab.com/o9000/tint2/wikis/Install#dependencies">dependencies</a>):</p><div class="highlight"><pre class="highlight plaintext"><code>git clone https://gitlab.com/o9000/tint2.git
 cd tint2
-git checkout 17.0.2
+git checkout 17.0.1
 mkdir build
 cd build
 cmake ..
--- a/doc/tint2.1
+++ b/doc/tint2.1
@@ -1,4 +1,4 @@
-.TH TINT2 1 "2021\-12\-04" 17.0.2
+.TH TINT2 1 "2021\-05\-29" 17.0.1
 .SH NAME
 .PP
 tint2 \- lightweight panel/taskbar
--- a/doc/tint2.md
+++ b/doc/tint2.md
@@ -1,4 +1,4 @@
-# TINT2 1 "2021-12-04" 17.0.2
+# TINT2 1 "2021-05-29" 17.0.1

 ## NAME
 tint2 - lightweight panel/taskbar