From 43048ce41c7be68db9ed030362d7227b837776d5 Mon Sep 17 00:00:00 2001
From: Justin Ehlert <justinehlert@flywheel.io>
Date: Thu, 12 Dec 2019 21:24:53 -0600
Subject: [PATCH 1/6] Switch to gitlab CI

---
 .circleci/config.yml                  | 70 ---------------------------
 .gitlab-ci.yml                        | 15 ++++++
 {.circleci => .gitlab}/litmus-test.sh |  0
 3 files changed, 15 insertions(+), 70 deletions(-)
 delete mode 100644 .circleci/config.yml
 create mode 100644 .gitlab-ci.yml
 rename {.circleci => .gitlab}/litmus-test.sh (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
deleted file mode 100644
index 31ddb50..0000000
--- a/.circleci/config.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-version: 2
-workflows:
-  version: 2
-  build-workflow:
-    jobs:
-      - build:
-          filters:
-            tags:
-              only: /.*/
-      - test-python3:
-          filters:
-            tags:
-              only: /.*/
-
-jobs:
-  build:
-    working_directory: "~/gears"
-
-    docker:
-      - image: python:2-alpine3.7
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          key: gears-1-{{ checksum "setup.py"}}
-
-      - run:
-          name: Install Dependencies
-          command: pip install -e .
-
-      - save_cache:
-          key: gears-1-{{ checksum "setup.py"}}
-          paths:
-              - "~/.cache/pip"
-
-      - run:
-          name: Validation suite
-          command: examples/test.py validation
-
-      - run:
-          name: Exchange litmus test
-          command: .circleci/litmus-test.sh
-
-  test-python3:
-    docker:
-      - image: python:3-alpine3.7
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          key: gears-1-{{ checksum "setup.py"}}
-
-      - run:
-          name: Install Dependencies
-          command: pip install -e .
-
-      - save_cache:
-          key: gears-1-{{ checksum "setup.py"}}
-          paths:
-              - "~/.cache/pip"
-
-      - run:
-          name: Validation suite
-          command: examples/test.py validation
-
-      - run:
-          name: Exchange litmus test
-          command: .circleci/litmus-test.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..561a36f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,15 @@
+include:
+  - project: flywheel-io/infrastructure/ci-templates
+    ref: python3
+    file: python3.yml
+
+variables:
+  PYLINT: "false"
+  PYPI: "false"
+  PYTEST: "false"
+
+test:litmus-test:
+  extends: .python3
+  script:
+    - .gitlab/litmus-test.sh
+
diff --git a/.circleci/litmus-test.sh b/.gitlab/litmus-test.sh
similarity index 100%
rename from .circleci/litmus-test.sh
rename to .gitlab/litmus-test.sh

From 984ae615b2dbb054dc3920df30559cabc8bc0f5f Mon Sep 17 00:00:00 2001
From: Justin Ehlert <justinehlert@flywheel.io>
Date: Thu, 12 Dec 2019 21:30:59 -0600
Subject: [PATCH 2/6] Update setup

---
 setup.cfg | 2 ++
 setup.py  | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 setup.cfg

diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..3480374
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 6a25a1a..3d4b790 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,15 @@
+import os
 from setuptools import setup
 
+VERSION = os.environ.get('CI_COMMIT_TAG', 0)
+
 setup(
-    version = '0',
-    name = 'gears',
+    version = VERSION,
+    name = 'flywheel_gears',
     author = 'Flywheel Exchange, LLC',
     author_email = 'support@flywheel.io',
     description  = 'Flywheel Gear tools',
-    url = 'https://github.com/flywheel-io/gears',
+    url = 'https://gitlab.com/flywheel-io/public/gears',
 
     packages = ['gears'],
     package_data = {'gears': ['../spec/manifest.schema.json']},

From 48057bd50b3516a0f2a99f621b852d4a84a91a4e Mon Sep 17 00:00:00 2001
From: Justin Ehlert <justinehlert@flywheel.io>
Date: Thu, 12 Dec 2019 21:32:12 -0600
Subject: [PATCH 3/6] Fix extends

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 561a36f..7634505 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
   PYTEST: "false"
 
 test:litmus-test:
-  extends: .python3
+  extends: .python
   script:
     - .gitlab/litmus-test.sh
 

From 6dbbdef7459c58057f7b43b43f9d85537075bc13 Mon Sep 17 00:00:00 2001
From: Justin Ehlert <justinehlert@flywheel.io>
Date: Thu, 12 Dec 2019 21:34:35 -0600
Subject: [PATCH 4/6] Enable pypi

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7634505..5664427 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,6 @@ include:
 
 variables:
   PYLINT: "false"
-  PYPI: "false"
   PYTEST: "false"
 
 test:litmus-test:

From 1bd99b4948a615f140bedab72e8161d60ad24e2a Mon Sep 17 00:00:00 2001
From: Justin Ehlert <justinehlert@flywheel.io>
Date: Thu, 12 Dec 2019 21:37:17 -0600
Subject: [PATCH 5/6] Use bash shell for litmus test

---
 .gitlab-ci.yml         | 1 -
 .gitlab/litmus-test.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5664427..9cddad1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,4 +11,3 @@ test:litmus-test:
   extends: .python
   script:
     - .gitlab/litmus-test.sh
-
diff --git a/.gitlab/litmus-test.sh b/.gitlab/litmus-test.sh
index 83b7f18..7beeae3 100755
--- a/.gitlab/litmus-test.sh
+++ b/.gitlab/litmus-test.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 set -euo pipefail
 set -x
 

From 8fa543cdc66f58336317dc87689ab7b7f82e64cc Mon Sep 17 00:00:00 2001
From: Justin Ehlert <justinehlert@flywheel.io>
Date: Fri, 13 Dec 2019 11:27:04 -0600
Subject: [PATCH 6/6] Add stage to litmus-test

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cddad1..3fb9179 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,5 +9,6 @@ variables:
 
 test:litmus-test:
   extends: .python
+  stage: test
   script:
     - .gitlab/litmus-test.sh