Skip to content
Snippets Groups Projects
Commit b98a4910 authored by Matthias Stefan Bodenbenner's avatar Matthias Stefan Bodenbenner
Browse files

Merge branch 'master' into develop

# Conflicts:
#	.gitlab-ci.yml
parents 431fe136 f2391e8d
No related branches found
No related tags found
No related merge requests found
...@@ -4,10 +4,12 @@ variables: ...@@ -4,10 +4,12 @@ variables:
stages: stages:
- build - build
- deploy - deploy
- notify
Build Wheel: Build Wheel:
image: python:3.9
tags: tags:
- wzlmq-apps - frodo
stage: build stage: build
artifacts: artifacts:
paths: paths:
...@@ -19,8 +21,9 @@ Build Wheel: ...@@ -19,8 +21,9 @@ Build Wheel:
- '& cmd /k "C:\Anaconda3\Scripts\activate.bat E:\environments\$env:UUID & python setup.py sdist bdist_wheel"' - '& cmd /k "C:\Anaconda3\Scripts\activate.bat E:\environments\$env:UUID & python setup.py sdist bdist_wheel"'
Copy To Package Registry: Copy To Package Registry:
image: python:3.9
tags: tags:
- wzlmq-apps - frodo
stage: deploy stage: deploy
artifacts: artifacts:
paths: paths:
......
LICENSE 0 → 100644
MIT License
Copyright (c) 2022 Chair for Production Metrology and Quality Management | RWTH Aachen University
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:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
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.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment