Merge branch 'modernize-testing' into 'development'

Modernize testing See merge request damask/DAMASK!306
2020-12-21 17:01:49 +01:00 · 2020-12-21 17:01:49 +01:00 · bc32797fad
parent d1c7ec0680 877a489ea5
commit bc32797fad
2 changed files with 1 additions and 15 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -262,20 +262,6 @@ Pytest_grid:
    - master
    - release

-Thermal:
-  stage: grid
-  script: Thermal/test.py
-  except:
-    - master
-    - release
-
-Nonlocal_Damage_DetectChanges:
-  stage: grid
-  script: Nonlocal_Damage_DetectChanges/test.py
-  except:
-    - master
-    - release
-
 Plasticity_DetectChanges:
  stage: grid
  script: Plasticity_DetectChanges/test.py
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e1a1048e1f593683b4b432d41455bd236008c3ad
+Subproject commit 313dd5de618c996cdf9ace95a096f25e757386d9