Update .gitlab-ci.yml file (merge commit)

Merge branch 'feature/gitlab-ci-release' into 'main' * remove extra spaces * codeql track main * add tox * Update .gitlab-ci.yml * Update .gitlab-ci.yml file See merge request https://gitlab.ci.csc.fi/sds-dev/crypt4gh-gui/-/merge_requests/25 Approved-by: Timo Nurminen <[email protected]> Co-authored-by: Stefan Negru <[email protected]> Merged by Teemu Kataja <[email protected]>
CSCfi · Feb 6, 2024 · cccce37 · cccce37
2 parents c3d35f2 + b185b1f
commit cccce37
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '40 11 * * 5'
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,32 @@
+stages:
+  - test
+  - release
+
+variables:
+  BUILD_IMAGE: $ARTIFACTORY_SERVER/sds/sdd-common-ci
+
+include:
+  - project: 'sds-dev/releases'
+    ref: main
+    file: 'releases.yml'
+
+test:
+  stage: test
+  tags:
+    - docker-exec
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+
+  image: $BUILD_IMAGE
+  before_script:
+    - pip install tox
+  script:
+    - tox -e black
+    - tox -e flake8
+    - tox -e mypy
+
+
+release-job:
+  extends: .automated-release
+  release:
+    description: 'Crypt4gh GUI'