From 89b1f442d13b37db53ef11573361cda10f552732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Seidel?= <49430012+sjuergen@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:22:26 +0100 Subject: [PATCH 1/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5b35cc2..1d05b73 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ 1. If not done, login to the GitHub registry - More information you'll find [here](https://github.com/simatic-ax/.sharedstuff/blob/main/doc/personalaccesstoken.md) + More information you'll find [here](https://github.com/simatic-ax/.github/blob/main/docs/personalaccesstoken.md) -1. create a new library project from template +1. create a new library project from template (local IDE) ```cli apax create @simatic-ax/ax2tia --registry https://npm.pkg.github.com From c4b6f462262e6e07bb1130f9dda8e536779e08af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Seidel?= Date: Mon, 5 Dec 2022 10:38:46 +0100 Subject: [PATCH 2/5] fix path --- template/apax.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/template/apax.yml b/template/apax.yml index 925cbfd..95828a5 100644 --- a/template/apax.yml +++ b/template/apax.yml @@ -10,14 +10,14 @@ repository: url: https://github.com/simatic-ax/apax-package-name-d7b4b031 # Environment variables variables: - # an arbitrary directory that can be chosen freely - PATH_NAME: "./bin/handover-folder" - # you can change the predefined output path where the TIA Portal library will be generated - TIA_GLOBAL_LIB_PATH: "./TIAPortalLibrary" - # remove, if you do not want to allow debugging of your code - APAX_BUILD_ARGS: - - "--debug" - # Variable is set in .env file Example: TIA_PORTAL_INSTALL_PATH="C:\Program Files\Siemens\Automation\Portal V18\Bin" + # an arbitrary directory that can be chosen freely + PATH_NAME: "./bin/handover-folder" + # you can change the predefined output path where the TIA Portal library will be generated + TIA_GLOBAL_LIB_PATH: "./TIAPortalLibrary" + # remove, if you do not want to allow debugging of your code + APAX_BUILD_ARGS: + - "--debug" +# Variable is set in .env file Example: TIA_PORTAL_INSTALL_PATH="C:\Program Files\Siemens\Automation\Portal V18\Bin" targets: - '1500' - 'axunit-llvm' @@ -26,16 +26,17 @@ targets: devDependencies: "@ax/sdk": 3.0.2 "@ax/ax2tia": 4.0.5 - "@simatic-ax/snippetscollection": 0.0.14 + "@simatic-ax/snippetscollection": 0.0.15 # Apax scripts scripts: # set the path to your local TIA Portal installation in the .env file - export-tialib: ax2tia -i ./bin/1500/*.lib -o "$PATH_NAME" - import-tialib: '"$TIA_INSTALL_PATH\\bin\\Siemens.Simatic.Lang.Library.Importer.exe" -i "$PATH_NAME" -o "$TIA_GLOBAL_LIB_PATH"' - create-tialib: - - apax build - - apax export-tialib - - apax import-tialib + export-tialib: ax2tia -i ./bin/1500/*.lib -o "$PATH_NAME" + import-tialib: '"$TIA_INSTALL_PATH\\Siemens.Simatic.Lang.Library.Importer.exe" + -i "$PATH_NAME" -o "$TIA_GLOBAL_LIB_PATH"' + create-tialib: + - apax build + - apax export-tialib + - apax import-tialib # Registry information, where the package will be published/consumed registries: '@simatic-ax': 'https://npm.pkg.github.com/' From 1e38b866148b6e06bd461b7b695d66ec40873916 Mon Sep 17 00:00:00 2001 From: Felix Krueger Date: Mon, 9 Jan 2023 09:51:22 +0100 Subject: [PATCH 3/5] feat(ci): Added reference to linting action in actions repository --- .github/workflows/lint-repo.yml | 4 ++++ .github/workflows/lint.yml | 19 ------------------- .markdownlint.yml | 5 ++++- repolinter.json | 21 +++++++++++++++++++++ 4 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 .github/workflows/lint-repo.yml delete mode 100644 .github/workflows/lint.yml create mode 100644 repolinter.json diff --git a/.github/workflows/lint-repo.yml b/.github/workflows/lint-repo.yml new file mode 100644 index 0000000..9863aa7 --- /dev/null +++ b/.github/workflows/lint-repo.yml @@ -0,0 +1,4 @@ +on: push +jobs: + lint-repo-and-markdown: + uses: simatic-ax/actions/.github/workflows/check-repository.yml@stable diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 7796d00..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: linter checks -on: - push: - -jobs: - linter: - name: "Linter Checks" - runs-on: ubuntu-latest - - - steps: - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Check markdown files - uses: avto-dev/markdown-lint@v1 - with: - args: '**/*.md' - ignore: ./LICENSE.md diff --git a/.markdownlint.yml b/.markdownlint.yml index 95479c5..62620c9 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -8,4 +8,7 @@ default: true line-length: false no-inline-html: false first-line-h1: false -no-emphasis-as-header: false \ No newline at end of file +no-emphasis-as-header: false +MD024: + allow_different_nesting: true + siblings_only: true \ No newline at end of file diff --git a/repolinter.json b/repolinter.json new file mode 100644 index 0000000..f662361 --- /dev/null +++ b/repolinter.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://raw.githubusercontent.com/todogroup/repolinter/master/rulesets/schema.json", + "version": 2, + "axioms": { + "linguist": "language", + "licensee": "license", + "packagers": "packager" + }, + "rules": { + "license-file-exists": { + "level": "off", + "rule": { + "type": "file-existence", + "options": { + "globsAny": ["LICENSE*", "COPYING*"], + "nocase": true + } + } + } + } +} \ No newline at end of file From 13b7c8e48721c4511e36f46f9b6b25b3eb226c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Seidel?= <49430012+sjuergen@users.noreply.github.com> Date: Wed, 11 Jan 2023 20:34:58 +0100 Subject: [PATCH 4/5] set version to 0.0.1 by default --- template/apax.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/apax.yml b/template/apax.yml index 95828a5..85f4e8a 100644 --- a/template/apax.yml +++ b/template/apax.yml @@ -1,6 +1,6 @@ # General information name: '@simatic-ax/apax-package-name-d7b4b031' -version: 0.0.0-placeholder +version: 0.0.1 # Description will be displayed in the apax extension description: type: lib From 9dfffb3ca8484c5d667f11d02c49d65500fd01b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Seidel?= <49430012+sjuergen@users.noreply.github.com> Date: Wed, 11 Jan 2023 20:35:25 +0100 Subject: [PATCH 5/5] Global Lib output folder name equal to name --- template/apax.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/apax.yml b/template/apax.yml index 85f4e8a..1a191cc 100644 --- a/template/apax.yml +++ b/template/apax.yml @@ -13,7 +13,7 @@ variables: # an arbitrary directory that can be chosen freely PATH_NAME: "./bin/handover-folder" # you can change the predefined output path where the TIA Portal library will be generated - TIA_GLOBAL_LIB_PATH: "./TIAPortalLibrary" + TIA_GLOBAL_LIB_PATH: "./apax-package-name-d7b4b031" # remove, if you do not want to allow debugging of your code APAX_BUILD_ARGS: - "--debug"