From f3beb8ba70a30c0ad9a8c5a8f4b7f51d0f415746 Mon Sep 17 00:00:00 2001
From: Matthew Treinish <mtreinish@kortar.org>
Date: Thu, 6 Oct 2022 19:13:55 -0400
Subject: [PATCH] Fix retworkx compat artifact CI job (#692)

Before pushing the 0.12.0 tag I noticed the CI configuration for the
retworkx release artifacts was broken and wouldn't run because of a
dependency on the rustworkx jobs that was defined in a separate
workflow. This commit updates the CI config by adding the retworkx
artifact job to the wheels workflow so we can express the dependency on
rustworkx being published first.
---
 .github/workflows/retworkx_wheels.yml | 31 ---------------------------
 .github/workflows/wheels.yml          | 24 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/retworkx_wheels.yml

diff --git a/.github/workflows/retworkx_wheels.yml b/.github/workflows/retworkx_wheels.yml
deleted file mode 100644
index a75c021b6..000000000
--- a/.github/workflows/retworkx_wheels.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Wheel Builds
-on:
-  push:
-    tags:
-      - '*'
-jobs:
-  sdist:
-    name: Build sdist
-    runs-on: ubuntu-latest
-    needs: ["build_wheels", "build-win32-wheels"]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.7'
-      - name: Install deps
-        run: pip install -U twine setuptools-rust
-      - name: Build sdist
-        run: python setup.py sdist bdist_wheel
-        env:
-          RUSTWORKX_PKG_NAME: retworkx
-      - uses: actions/upload-artifact@v2
-        with:
-          path: ./dist/*
-      - name: Upload to PyPI
-        run: twine upload ./dist/*
-        env:
-          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-          TWINE_USERNAME: retworkx-ci
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index e59aaaa25..2b1e02c90 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -356,3 +356,27 @@ jobs:
         env:
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
           TWINE_USERNAME: retworkx-ci
+    retworkx-compat-build:
+      name: Build retworkx
+      runs-on: ubuntu-latest
+      needs: ["build_wheels", "build-win32-wheels"]
+      steps:
+        - uses: actions/checkout@v2
+        - uses: actions/setup-python@v2
+          name: Install Python
+          with:
+            python-version: '3.7'
+        - name: Install deps
+          run: pip install -U twine setuptools-rust
+        - name: Build sdist
+          run: python setup.py sdist bdist_wheel
+          env:
+            RUSTWORKX_PKG_NAME: retworkx
+        - uses: actions/upload-artifact@v2
+          with:
+            path: ./dist/*
+        - name: Upload to PyPI
+          run: twine upload ./dist/*
+          env:
+            TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+            TWINE_USERNAME: retworkx-ci