From 5edacdc2d4ba41a591a42af7caf50af8b16d736b Mon Sep 17 00:00:00 2001 From: oblomov <102328295+oblomov-dev@users.noreply.github.com> Date: Mon, 22 Apr 2024 10:01:23 +0200 Subject: [PATCH] ci updates (#168) * ci updates * update * update * update * update * update --- abaplint-app.jsonc | 19 ++++++---- abaplint-syntax_cloud.jsonc | 38 ------------------- ci/abaplint-abap_cloud_readiness.jsonc | 38 +++++++++++++++++++ ci/abaplint-abap_standard_readiness.jsonc | 38 +++++++++++++++++++ .../abaplint-downport.jsonc | 2 +- abaplint.jsonc => ci/abaplint.jsonc | 2 +- package.json | 2 +- 7 files changed, 90 insertions(+), 49 deletions(-) delete mode 100644 abaplint-syntax_cloud.jsonc create mode 100644 ci/abaplint-abap_cloud_readiness.jsonc create mode 100644 ci/abaplint-abap_standard_readiness.jsonc rename abaplint-downport.jsonc => ci/abaplint-downport.jsonc (95%) rename abaplint.jsonc => ci/abaplint.jsonc (99%) diff --git a/abaplint-app.jsonc b/abaplint-app.jsonc index 5d7e5263..92d0a38f 100644 --- a/abaplint-app.jsonc +++ b/abaplint-app.jsonc @@ -1,10 +1,13 @@ { - "configurations": { - "default": { - "filename": "./abaplint.jsonc" - }, - "abap_cloud_readiness": { - "filename": "./abaplint-syntax_cloud.jsonc" + "configurations": { + "default": { + "filename": "./ci/abaplint.jsonc" + }, + "abap_standard_readiness": { + "filename": "./ci/abaplint-abap_standard_readiness.jsonc" + }, + "abap_cloud_readiness": { + "filename": "./ci/abaplint-abap_cloud_readiness.jsonc" + } } - } -} + } \ No newline at end of file diff --git a/abaplint-syntax_cloud.jsonc b/abaplint-syntax_cloud.jsonc deleted file mode 100644 index 4c53a31e..00000000 --- a/abaplint-syntax_cloud.jsonc +++ /dev/null @@ -1,38 +0,0 @@ -{ - "global": { - "files": "/src/**/*.*" - }, - "dependencies": [ - { - "url": "https://github.com/abapedia/steampunk-2302-api", - "folder": "/deps", - "files": "/src/**/*.*" - }, - { - "url": "https://github.com/abap2UI5/abap2UI5", - "folder": "/abap2UI5", - "files": "/src/**/*.*" - } - ], - "syntax": { - "version": "Cloud", - "errorNamespace": "." - }, - "rules": { - "begin_end_names": true, - "cds_parser_error": true, - "check_ddic": true, - "strict_sql": true, - "sql_escape_host_variables": true, - "check_include": true, - "check_syntax": true, - "cloud_types": true, - "global_class": true, - "implement_methods": true, - "method_implemented_twice": true, - "parser_error": true, - "superclass_final": true, - "unknown_types": true, - "xml_consistency": true - } -} diff --git a/ci/abaplint-abap_cloud_readiness.jsonc b/ci/abaplint-abap_cloud_readiness.jsonc new file mode 100644 index 00000000..03f862a4 --- /dev/null +++ b/ci/abaplint-abap_cloud_readiness.jsonc @@ -0,0 +1,38 @@ +{ + "global": { + "files": "/src/**/*.*" + }, + "dependencies": [ + { + "url": "https://github.com/abapedia/steampunk-2305-api-intersect-702", + "folder": "/deps", + "files": "/src/**/*.*" + }, + { + "url": "https://github.com/abap2UI5/abap2UI5", + "folder": "/abap2UI5", + "files": "/src/**/*.*" + } + ], + "syntax": { + "version": "Cloud", + "errorNamespace": "." + }, + "rules": { + "begin_end_names": true, + "cds_parser_error": true, + "check_ddic": true, + "strict_sql": true, + "sql_escape_host_variables": true, + "check_include": true, + "check_syntax": true, + "cloud_types": true, + "global_class": true, + "implement_methods": true, + "method_implemented_twice": true, + "parser_error": true, + "superclass_final": true, + "unknown_types": true, + "xml_consistency": true + } + } \ No newline at end of file diff --git a/ci/abaplint-abap_standard_readiness.jsonc b/ci/abaplint-abap_standard_readiness.jsonc new file mode 100644 index 00000000..1fd67bb1 --- /dev/null +++ b/ci/abaplint-abap_standard_readiness.jsonc @@ -0,0 +1,38 @@ +{ + "global": { + "files": "/src/**/*.*" + }, + "dependencies": [ + { + "url": "https://github.com/abapedia/steampunk-2305-api-intersect-702", + "folder": "/deps", + "files": "/src/**/*.*" + }, + { + "url": "https://github.com/abap2UI5/abap2UI5", + "folder": "/abap2UI5", + "files": "/src/**/*.*" + } + ], + "syntax": { + "version": "750", + "errorNamespace": "." + }, + "rules": { + "begin_end_names": true, + "cds_parser_error": true, + "check_ddic": true, + "strict_sql": true, + "sql_escape_host_variables": true, + "check_include": true, + "check_syntax": true, + "cloud_types": true, + "global_class": true, + "implement_methods": true, + "method_implemented_twice": true, + "parser_error": true, + "superclass_final": true, + "unknown_types": true, + "xml_consistency": true + } + } \ No newline at end of file diff --git a/abaplint-downport.jsonc b/ci/abaplint-downport.jsonc similarity index 95% rename from abaplint-downport.jsonc rename to ci/abaplint-downport.jsonc index 435af17f..32f241e5 100644 --- a/abaplint-downport.jsonc +++ b/ci/abaplint-downport.jsonc @@ -1,6 +1,6 @@ { "global": { - "files": "/downport/**/*.*" + "files": "/../downport/**/*.*" }, "dependencies": [ { diff --git a/abaplint.jsonc b/ci/abaplint.jsonc similarity index 99% rename from abaplint.jsonc rename to ci/abaplint.jsonc index 956542fd..0f540bf9 100644 --- a/abaplint.jsonc +++ b/ci/abaplint.jsonc @@ -15,7 +15,7 @@ } ], "syntax": { - "version": "v750", + "version": "v757", "errorNamespace": "." }, "rules": { diff --git a/package.json b/package.json index 0b410010..25bcd44f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "description": "Explore Code Samples of abap2UI5", "scripts": { "syfixes": "find . -type f -name '*.abap' -exec sed -i -e 's/ RAISE EXCEPTION TYPE cx_sy_itab_line_not_found/ ASSERT 1 = 0/g' {} + ", - "downport": "rm -rf downport && cp -r src downport && abaplint --fix abaplint-downport.jsonc && npm run syfixes", + "downport": "rm -rf downport && cp -r src downport && abaplint --fix ./ci/abaplint-downport.jsonc && npm run syfixes", "unit": "echo RUNNING && node output/index.mjs", "transpile": "rm -rf output && abap_transpile test/abap_transpile.json", "test": "npm run downport && npm run transpile && npm run unit"