Start working on connecting github actions with circleci

wlav · Mar 9, 2023 · 230004e · 230004e
1 parent 1065402
commit 230004e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 59 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,32 +1,13 @@
-version: 2
-# Get inspiration from https://github.com/dwavesystems/dimod/blob/main/.circleci/config.yml
-jobs:
-  # linux-wheels:
-  #   working_directory: ~/linux-wheels
-  #   machine:
-  #     image: ubuntu-2004:2022.10.1
-  #   resource_class: large
-  #   environment:
-  #       STDCXX: 20
-  #       MAKE_NPROCS: 4
-  #   steps:
-  #     - checkout
-  #     - run: 
-  #         name: Update 
-  #         command: |
-  #           sudo apt-get update && sudo apt-get install git cmake build-essential tar curl g++ gcc-9 clang-10
-  #     - run:
-  #         name: Build the Linux wheels.
-  #         command: |
-  #           python3 -m venv venv
-  #           . venv/bin/activate
-  #           python3 -m pip install pip --upgrade
-  #           python3 -m pip install cibuildwheel==2.12.0
-  #           python3 -m cibuildwheel cling --print-build-identifiers
-  #           python3 -m cibuildwheel cling --output-dir wheelhouse
-  #     - store_artifacts:
-  #         path: wheelhouse/
+version: 2.1
+
+parameters:
+  build_aarch64_wheel:
+    description: "Whether to build aarch64 wheel on CircleCI"
+    default: false
+    type: boolean
 
+
+jobs:
   linux-aarch64-wheels:
     working_directory: ~/linux-aarch64-wheels
     machine:
@@ -51,28 +32,10 @@ jobs:
       - store_artifacts:
           path: wheelhouse/
 
-  # osx-wheels:
-  #   working_directory: ~/osx-wheels
-  #   macos:
-  #     xcode: 12.5.1
-  #   steps:
-  #     - checkout
-  #     - run:
-  #         name: Build the OS X wheels.
-  #         command: |
-  #           python3 -m venv venv
-  #           . venv/bin/activate
-  #           python3 -m pip install pip --upgrade
-  #           python3 -m pip install cibuildwheel==2.12.0
-  #           python3 -m cibuildwheel cling --print-build-identifiers
-  #           python3 -m cibuildwheel cling --output-dir wheelhouse
-  #     - store_artifacts:
-  #         path: wheelhouse/
 
 workflows:
-  version: 2
-  all-tests:
+  build-aarch64-wheels:
+    when: << pipeline.parameters.build_aarch64_wheel >>
     jobs:
       - linux-aarch64-wheels
-      # - linux-wheels
-      # - osx-wheels
+
diff --git a/.github/workflows/cling-wheels.yml b/.github/workflows/cling-wheels.yml
@@ -1,16 +1,31 @@
 name: Build and upload to PyPI
 
-# Build on every branch push, tag push, and pull request change:
-on: [push] #, pull_request]
-# Alternatively, to publish when a (published) GitHub Release is created, use the following:
-# on:
-#   push:
-#   pull_request:
-#   release:
-#     types:
-#       - published
+on:
+  workflow_dispatch:
+    inputs:
+      build_aarch64_wheel:
+        description: "Whether to build aarch64 wheel on CircleCI"
+        default: false
+        type: boolean
+      branch:
+        description: "Which branch to target"
+        default: build-wheels-with-cibuildwheel
+        type: string
 
 jobs:
+  build-aarch64-wheels:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+      - name: Trigger circleci build for ARM
+        run: |
+          echo "Need to trigger circleci pipeline"
+
   build_wheels:
     name: Build wheels on ${{ matrix.cibw.build }}
     runs-on: ${{ matrix.os }}
@@ -120,7 +135,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: setup python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: "3.9"
           architecture: ${{ matrix.architecture }}