aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorThomas <>2022-01-10 18:07:40 +0100
committerThomas <>2022-01-10 18:07:40 +0100
commit6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715 (patch)
tree723fb115e6f328ad1836247f7e8e276e5269f5ff /.gitlab-ci.yml
parent0d9f042b4c88ba5f34da452cd19ada24146d32af (diff)
parentc007dfb5d809b532c17e1dcc1373dd8b2861f993 (diff)
downloadNational_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.tar.gz
National_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.tar.bz2
National_eIDAS_Gateway-6b1ea6a676c9f8fd115c0946fa4302a7a2ad5715.zip
Merge branch 'nightlybuild' into feature/matching_base_rebase
# Conflicts: # .gitlab-ci.yml # connector/src/main/resources/specific_eIDAS_connector.beans.xml # connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java # pom.xml
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df21e049..f408b1df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ include:
default:
tags:
- - docker
+ - docker
stages:
- assemble