Skip to content

Commit 9b4d180

Browse files
authored
Merge pull request #14 from simatic-ax/V0.0.13
V0.0.13
2 parents 98872eb + 1b9db6a commit 9b4d180

File tree

10 files changed

+31
-113
lines changed

10 files changed

+31
-113
lines changed

.github/workflows/github-action-release_for_template.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ on:
33
push:
44
branches:
55
- release
6-
6+
workflow_dispatch:
7+
branches:
8+
- release
79
env:
810
PROJECT_NAME: snippetscollection
911
SCOPE: simatic-ax
@@ -78,11 +80,6 @@ jobs:
7880
with:
7981
apax-access-token: ${{ secrets.APAX_TOKEN }}
8082

81-
# - name: "Download artifact"
82-
# uses: actions/download-artifact@v3
83-
# with:
84-
# name: library-artifact
85-
8683
- name: "Login to the private repo"
8784
run: |
8885
apax login \

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
[Tt]est[Rr]esult*/
66
*.tgz
77
*.tracerec.json
8+
apax-lock.json

.gitlab-ci.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

LIBRARY.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

LICENSE.md

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,33 @@ Siemens AG and/or a subsidiary of Siemens AG ("Siemens") provides You royalty-fr
1010

1111
Siemens provides products and solutions with industrial security functions that support the secure operation of plants, systems, machines and networks.
1212

13-
In order to protect plants, systems, machines and networks against cyber threats, it is necessary to implement – and continuously maintain – a holistic, state-of-the-art industrial security concept.
14-
15-
Siemens' products and solutions constitute one element of such a concept.
13+
In order to protect plants, systems, machines and networks against cyber threats, it is necessary to implement – and continuously maintain – a holistic, state-of-the-art industrial security concept. Siemens' products and solutions constitute one element of such a concept.
1614
Customers are responsible for preventing unauthorized access to their plants, systems, machines and networks. Such systems, machines and components should only be connected to an enterprise network or the internet if and to the extent such a connection is necessary and only when appropriate security measures (e.g. firewalls and/or network segmentation) are in place.
1715

18-
For additional information on industrial security measures that may be implemented, please visit
16+
For additional information on industrial security measures that may be implemented, please visit
1917
<https://www.siemens.com/industrialsecurity>.
2018

2119
**1.3 Compliance with Export Control Regulations**
2220

23-
You shall comply with all applicable sanctions, embargoes and (re-)export control regulations, and, in any event, with those of the European Union and the United States of America (collectively "Export Regulations"). In particular, the information, software and documentation provided by Siemens (collectively "Licensed Material") shall not be used, accessed or transferred, unless permitted by the Export Regulations or respective governmental licenses or approvals, (i) in or to any location prohibited by or subject to comprehensive sanctions (currently Russia, Cuba, Iran, North Korea, Syria, and the Crimea region of Ukraine, Donetsk and Luhansk regions of Ukraine) or license requirements according to the Export Regulations; (ii) by or to any individual or entity designated on a sanctioned party list of the Export Regulations; (iii) for any purpose prohibited by the Export Regulations (e.g. use in connection with armaments, nuclear technology or weapons); or (iv) to upload any content unless it is noncontrolled (e .g. in the EU: AL = N; in the U.S.: ECCN = N or EAR99). If required to enable authorities or Siemens to conduct export control checks, You, upon request by Siemens, shall promptly provide Siemens with all information pertaining to You, the intended use and the location of use of the Licensed Material. Siemens shall not be obligated to fulfill this Agreement if such fulfillment is prevented by any impediments arising out of national or international foreign trade or customs requirements or any embargoes or other sanctions.
24-
25-
**2. Open Source License for Software in source code and generated source code**
21+
You shall comply with all applicable sanctions, embargoes and (re-)export control regulations, and, in any event, with those of the European Union and the United States of America (collectively "Export Regulations"). In particular, the information, software and documentation provided by Siemens (collectively "Licensed Material") shall not be used, accessed or transferred, unless permitted by the Export Regulations or respective governmental licenses or approvals, (i) in or to any location prohibited by or subject to comprehensive sanctions (currently Russia, Cuba, Iran, North Korea, Syria, and the Crimea region of Ukraine, Donetsk and Luhansk regions of Ukraine) or license requirements according to the Export Regulations; (ii) by or to any individual or entity designated on a sanctioned party list of the Export Regulations; (iii) for any purpose prohibited by the Export Regulations (e.g. use in connection with armaments, nuclear technology or weapons); or (iv) to upload any content unless it is noncontrolled (e .g. in the EU: AL = N; in the U.S.: ECCN = N or EAR99). If required to enable authorities or Siemens to conduct export control checks, You, upon request by Siemens, shall promptly provide Siemens with all information pertaining to You, the intended use and the location of use of the Licensed Material. Siemens shall not be obligated to fulfill this Agreement if such fulfillment is prevented by any impediments arising out of national or international foreign trade or customs requirements or any embargoes or other sanctions.
2622

27-
In case the Software contains or generates source code the following open source license shall apply for such source code:
23+
**2. Open Source License for Software provided in source code and the generated source code**
2824

29-
MIT License
25+
In case the Software contains or generates source code the following open source license (Open license terms) shall apply for such source code:
26+
27+
MIT License
28+
29+
Copyright 2022 Siemens AG
3030

31-
Copyright 2022 Siemens AG
31+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
32+
33+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
3234

33-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
35+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3436

35-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
37+
To the extent there is a conflict between this terms and conditions and the Open License Terms, the Open License Terms shall prevail over this terms and conditions with regard to source code.
3638

37-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
39+
You acknowledge and agree that Siemens provides no warranties, express or implied, for the open source software itself. Siemens shall have no liability nor shall Siemens provide any indemnification whatsoever in respect of Your distribution or modification of the open source software.
3840

3941
**3. Software provided in object code**
4042

@@ -52,10 +54,10 @@ Siemens shall make available to You, at Your request, the Open Source Software s
5254

5355
The Software may, in addition to Open Source Software, contain other licensed software, i.e. software which was not developed by Siemens itself, but which Siemens has obtained from third parties, e.g. Microsoft Ireland Operations Ltd, under a license. If You shall receive in such case the conditions of the respective licensor of the licensed software in the Readme_OSS file, these shall apply to the liability of the licensor in relation to You. In terms of the liability of Siemens to You, these Royalty-Free Siemens Software Conditions shall apply in each case.
5456

55-
Royalty-Free Software License Version 1.0 – 11.04.2022
56-
5757
**3.3 Disclaimer of liability**
5858

5959
Siemens shall not assume any liability, for any legal reason whatsoever, including, without limitation, liability for the usability, availability, completeness and freedom from defects of the Software as well as for the Licensed Material and any damage caused thereby. This shall not apply in cases of mandatory liability, for example product liability law or in cases of intent, gross negligence, or culpable loss of life, bodily injury or damage to health, non-compliance with a guarantee, fraudulent non-disclosure of a defect, or culpable breach of material contractual obligations. Claims for damages arising from a breach of material contractual obligations shall however be limited to the foreseeable damage typical of the type of agreement, unless liability arises from intent or gross negligence or is based on loss of life, bodily injury or damage to health. The foregoing provisions do not imply any change in the burden of proof to Your detriment. You shall indemnify Siemens against existing or future claims of third parties in this connection except where Siemens is mandatorily liable.
6060

6161
By using the Software and the Licensed Material, You acknowledge that Siemens cannot be held liable for any damage beyond the liability provisions described.
62+
63+
Royalty-Free Software License Version 1.1 – 30.09.2022

TESTS.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

apax.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
1+
# General information
12
name: '@simatic-ax/snippetscollection'
2-
version: 0.0.13
3+
version: 0.0.0-placeholder
34
author: Siemens AG
5+
# Description will be displayed in the apax extension
6+
description: This package contains some useful snippets for ST programming
47
type: generic
5-
variables:
6-
GITHUB_REG_URL: "https://npm.pkg.github.com"
7-
8-
scripts:
9-
publishlib:
10-
- apax publish --package *.apax.tgz --registry $GITHUB_REG_URL
11-
- rm *.apax.tgz -f
12-
13-
createpackage:
14-
- apax version $1
15-
- apax pack
16-
8+
#URL to the repository
9+
repository:
10+
type: git
11+
url: https://github.com/simatic-ax/snippetscollection
12+
# Registry information, where the package will be published
1713
registries:
1814
'@ax-showcase': 'https://npm.pkg.github.com/'
19-
15+
# Files, which will be shipped with the library
2016
files:
2117
- 'README.md'
2218
- 'LICENSE.md'

changelog.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/sample.st

Lines changed: 0 additions & 12 deletions
This file was deleted.

test/sampletest.st

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)