wipwipwipity

edenhill · edenhill · commit 2f2609ee67e8 · 2022-01-17T15:42:36.000+01:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,23 +1,18 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine.
-# See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 
-# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
-# See: https://circleci.com/docs/2.0/orb-intro/
 orbs:
-  # The python orb contains a set of prepackaged CircleCI configuration you can use repeatedly in your configuration files
-  # Orb commands and jobs help you with common scripting around a language/tool
-  # so you dont have to copy and paste it everywhere.
-  # See the orb documentation here: https://circleci.com/developer/orbs/orb/circleci/python
   python: circleci/python@1.2
   win: circleci/windows@2.2.0
 
+common_params: &COMMON_PARAMS
+  parameters:
+    librdkafka_version:
+      type: string
+      default: v1.8.2
+
 commands:
   install-librdkafka:
-    parameters:
-      librdkafka_version:
-        type: string
-        default: v1.8.2
+    <<: *COMMON_PARAMS
     steps:
       - restore_cache:
           keys:
@@ -37,10 +32,7 @@ commands:
           command: tools/install-interceptors.sh
 
   build-wheels:
-    parameters:
-      librdkafka_version:
-        type: string
-        default: v1.8.2
+    <<: *COMMON_PARAMS
     steps:
       - run:
           name: Build wheels
@@ -50,22 +42,10 @@ commands:
           path: wheelhouse
 
 
-# Define a job to be invoked later in a workflow.
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  build-and-test: # This is the name of the job, feel free to change it to better match what you're trying to do!
-    # These next lines defines a Docker executors: https://circleci.com/docs/2.0/executor-types/
-    # You can specify an image from Dockerhub or use one of the convenience images from CircleCI's Developer Hub
-    # A list of available CircleCI Docker convenience images are available here: https://circleci.com/developer/images/image/cimg/python
-    # The executor is the environment in which the steps below will be executed - below will use a python 3.8 container
-    # Change the version below to your required version of python
+  build-and-test:
     docker:
       - image: cimg/python:3.8
-    # Checkout the code as the first step. This is a dedicated CircleCI step.
-    # The python orb's install-packages step will install the dependencies from a Pipfile via Pipenv by default.
-    # Here we're making sure we use just use the system-wide pip. By default it uses the project root's requirements.txt.
-    # Then run your tests!
-    # CircleCI will report the results back to your VCS provider.
     environment:
       LD_LIBRARY_PATH: ~/destdir/lib
     steps:
@@ -110,10 +90,7 @@ jobs:
       - build-wheels
 
   build-wheels-windows:
-    parameters:
-      librdkafka_version:
-        type: string
-        default: v1.8.2
+    <<: *COMMON_PARAMS
     executor: win/default
     steps:
       - checkout
@@ -143,15 +120,14 @@ jobs:
       - checkout
       - build-wheels
 
-# Invoke jobs via workflows
-# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
-  build: # This is the name of the workflow, feel free to change it to better match your workflow.
-    # Inside the workflow, you define the jobs you want to run.
+  build:
     jobs:
       - build-and-test
   build-wheels-all:
+    when:
+      <<pipeline.git.tag>>
     jobs:
-#      - build-wheels-linux
+      - build-wheels-linux
       - build-wheels-windows
-#      - build-wheels-osx
+      - build-wheels-osx
