Skip to content
Snippets Groups Projects
Commit 903e4cd1 authored by Malte Bauch's avatar Malte Bauch
Browse files

Merge branch 'master' into 41-restructure-project-directory-structure

parents 23d21762 af7a6ce8
Branches
Tags
3 merge requests!90Develop,!54Resolve "Restructure Project Directory Structure",!53V.0.1.0 Codename Threadbare
Pipeline #52777 passed
This commit is part of merge request !53. Comments created here will be created in the context of that merge request.
...@@ -2,8 +2,8 @@ code-quality-master: ...@@ -2,8 +2,8 @@ code-quality-master:
image: golangci/golangci-lint:latest-alpine image: golangci/golangci-lint:latest-alpine
stage: test stage: test
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
- if: '$CI_DEFAULT_BRANCH' - if: $CI_DEFAULT_BRANCH
script: script:
# writes golangci-lint output to gl-code-quality-report.json # writes golangci-lint output to gl-code-quality-report.json
- golangci-lint run --config build/ci/.golangci-config/.golangci-master.yml --out-format code-climate | tee gl-code-quality-report.json - golangci-lint run --config build/ci/.golangci-config/.golangci-master.yml --out-format code-climate | tee gl-code-quality-report.json
......
...@@ -21,7 +21,7 @@ documentation:pdf: ...@@ -21,7 +21,7 @@ documentation:pdf:
before_script: before_script:
- cargo install mdbook - cargo install mdbook
image: image:
name: rustdocker/rust:stable name: rust:latest
stage: documentation stage: documentation
script: script:
- mdbook build documentation --dest-dir public - mdbook build documentation --dest-dir public
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment