Commit ffd20f24 authored by canterburym's avatar canterburym
Browse files

Adding trial merge test

parent b2aeb934

.gitlab-ci.yml

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ stages: 
  - Syntax

  - Lint

  - Compile

  - MergeTest



parseASN1:

  stage: Syntax
@@ -30,3 +31,8 @@ compileASN1: 
  - python3 testing/compile_asn1.py

  allow_failure: true



MergeTest:

  stage: MergeTest

  script:

  - python3 testing/merge_test.py

  allow_failure: true

testing/merge_test.py

0 → 100644
+1 −0
Original line number Diff line number Diff line 
print ("Hello world")
 
 No newline at end of file