From 1dd74478b10c08a634552d9e80827173f2d3b208 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 22 Jun 2021 00:25:27 +0200 Subject: [PATCH] adjust testing to new J2 behavior --- .gitlab-ci.yml | 14 ++++++++------ PRIVATE | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31580458f..a8e73a6da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -198,13 +198,15 @@ core: - master - release -Phenopowerlaw_singleSlip: - stage: fortran - script: Phenopowerlaw_singleSlip/test.py - except: - - master - - release +# Needs closer look +#Phenopowerlaw_singleSlip: +# stage: fortran +# script: Phenopowerlaw_singleSlip/test.py +# except: +# - master +# - release +# Conversion to pytest ongoing J2_plasticBehavior: stage: fortran script: diff --git a/PRIVATE b/PRIVATE index 47229e637..79929319c 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 47229e6375fe0dafc01fda6e74ec704df4f793a7 +Subproject commit 79929319c0756bdff58dd69cf4969774a880c1bf