Commit cb45ea96 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict and linting new changes

parents 39e19141 0b234878

.ecrc

0 → 100644
+10 −0
Original line number Diff line number Diff line 
{

    "Exclude" : [

        ".git",

        "\\.py",

        "33108",

        "33128/r17",

        "33128/r16",

        "33128/r15"

    ]

}

.editorconfig

+7 −2
Original line number Diff line number Diff line 
[**]

insert_final_newline = true



[**.{asn1,asn,xsd,xml}]

[**.{asn1,asn,json}]

indent_style = space

indent_size = 4

trim_trailing_whitespace = true



[**.{xsd, xml}]

indent_style = space

indent_size = 2

trim_trailing_whitespace = true

.gitlab-ci.yml

+10 −1
Original line number Diff line number Diff line
@@ -27,11 +27,20 @@ process_asn: 
    - python3 testing/asn_process.py



process_xsd:

  image: "forge.3gpp.org:5050/sa3/li/xsdtest:latest"

  image: "forge.3gpp.org:5050/sa3/li/xsdtest_test:latest"

  stage: check

  interruptible: true

  script:

    - python3 testing/xsd_process.py

    - python3 testing/lint_xml.py



editorconfig_check:

  image: "forge.3gpp.org:5050/sa3/li/ec_test:latest"

  stage: check

  interruptible: true

  script:

    - ec





generate_artefacts:

  image: "forge.3gpp.org:5050/sa3/li/forgelib"

33128/r18/TS33128Dictionaries.xml

+81 −82
Original line number Diff line number Diff line
@@ -92,5 +92,4 @@ 
            </DictionaryEntry>

        </DictionaryEntries>

    </Dictionary>

<Dictionaries>

</Dictionaries>

33128/r18/TS33128Payloads.asn

+46 −47
Original line number Diff line number Diff line
@@ -4148,7 +4148,6 @@ PTCListManagementType ::= ENUMERATED 
    requestUnsuccessful(5)

}





PTCListManagementAction  ::= ENUMERATED

{

    create(1),