From 83051b02e718dd0fbfd93fdd534bfc097e4ebbe6 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 16 Sep 2019 22:09:19 -0700 Subject: [PATCH 1/2] Add license --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ac84176 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Raoul Snyman + +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. From e91f811e94efe23d2d71dc18ac82ff91af7024f7 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 16 Sep 2019 22:12:32 -0700 Subject: [PATCH 2/2] Only run gitlab on main master --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98d8051..d286532 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,8 @@ build-debian: - docker build --cache-from $CONTAINER_IMAGE:debian --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:debian -f Dockerfile.debian . - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA - docker push $CONTAINER_IMAGE:debian + only: + - master@openlp/runners build-ubuntu: stage: build @@ -26,6 +28,8 @@ build-ubuntu: - docker build --cache-from $CONTAINER_IMAGE:ubuntu --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:ubuntu -f Dockerfile.ubuntu . - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA - docker push $CONTAINER_IMAGE:ubuntu + only: + - master@openlp/runners build-fedora: stage: build @@ -34,3 +38,5 @@ build-fedora: - docker build --cache-from $CONTAINER_IMAGE:fedora --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:fedora -f Dockerfile.fedora . - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA - docker push $CONTAINER_IMAGE:fedora + only: + - master@openlp/runners