Skip to content
Snippets Groups Projects
Commit f489e4a1 authored by Corné Lukken's avatar Corné Lukken
Browse files

Address review comments

parent 4d5eba33
Branches
Tags
1 merge request!8Convert cookiecutter
Pipeline #61872 waiting for manual action
Pipeline: C++ project

#61873

    ......@@ -14,11 +14,24 @@ default:
    - cd my_awesome_app
    - git init
    # Override semgrep-sast before script
    sast:
    # override before_script from default: definition above, inherited job image otherwise
    # won't have Python available
    before_script:
    - python --version # For debugging
    dependency_scanning:
    # override before_script from default: definition above, inherited job image otherwise
    # won't have Python available
    before_script:
    - uname
    secret_detection:
    # override before_script from default: definition above, inherited job image otherwise
    # won't have Python available
    before_script:
    - uname
    # Override format artifact paths
    format:
    artifacts:
    ......
    ......@@ -9,7 +9,7 @@ If you find some missing functionality with regards to CI/CD, testing, linting o
    ## How to apply this template
    This templates uses `cookiecutter` which can be
    This templates uses `cookiecutter` which can be easily installed:
    ```bash
    pip install --user cookiecutter
    ......
    ......@@ -22,9 +22,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
    libboost-test-dev \
    ninja-build \
    python3-breathe \
    python3-pip \
    && \
    python3-pip && \
    rm -rf /var/lib/apt/lists/*
    RUN python3 -m pip install --upgrade pip
    RUN pip install --upgrade cookiecutter tox twine
    \ No newline at end of file
    RUN pip install --upgrade cookiecutter tox twine --no-cache-dir
    \ No newline at end of file
    ......@@ -40,9 +40,7 @@ format:
    script:
    - scripts/format-cpp.sh
    - scripts/format-cmake.sh
    - git diff > format.patch
    # Fail when the patch is not empy (note ! can't be used directly.)
    - (! grep -q '^--- a' format.patch)
    - git diff --exit-code 1
    artifacts:
    when: on_failure
    paths:
    ......@@ -63,16 +61,6 @@ sast:
    pmd-apex, sobelow, spotbugs
    stage: test
    dependency_scanning:
    # override default before_script, job won't have Python available
    before_script:
    - uname
    secret_detection:
    # override default before_script, job won't have Python available
    before_script:
    - uname
    test:
    stage: test
    needs: ["trigger_prepare"]
    ......
    ......@@ -21,6 +21,5 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
    graphviz \
    libboost-test-dev \
    ninja-build \
    python3-breathe \
    && \
    python3-breathe && \
    rm -rf /var/lib/apt/lists/*
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment