From 6b1ddd6ffcb13a2796d97f3e913a796d5e96b953 Mon Sep 17 00:00:00 2001
From: Clyde Johnston <clyde.johnston@zubax.com>
Date: Wed, 9 Aug 2023 08:16:19 +0000
Subject: [PATCH] Added make-release workflow conditions

---
 .github/workflows/make-release.yml | 37 +++++++++++++++++-------------
 .github/workflows/test-release.yml |  4 ++--
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index e1d80484..aaad58a5 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -1,12 +1,8 @@
-name: 'Build PyCyphal'
+name: 'Release PyCyphal'
 on:
   push:
-    tags: [ '#release' ]
-  workflow_run:
-    workflows: [ 'Test PyCyphal' ]
-    branches: [ master ]
-    types: [ completed ]
-
+    branch: [ master, issue-259 ]
+    tag: [ '#release' ]
 
 # Ensures that only one workflow is running at a time
 concurrency:
@@ -17,12 +13,20 @@ jobs:
   pycyphal-release:
     name: Release PyCyphal
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - name: Check out
         uses: actions/checkout@v3
 
-      - name: Install dependencies
+      - name: Wait for test job to complete
+        uses: lewagon/wait-on-check-action@v1.3.1
+        with:
+          ref: ${{ github.sha }}
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 10
+          running-workflow-name: 'Test PyCyphal'
+          check-name: 'Run PyCyphal tests'
+
+      - name: Create distribution wheel
         run: |
           git submodule update --init --recursive
           python -m pip install --upgrade pip setuptools wheel twine
@@ -35,14 +39,15 @@ jobs:
 
       - name: Upload distribution
         run: |
-          python -m twine upload dist/*
+          echo 'python -m twine upload dist/*'
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_PYCYPHAL }}
 
-      - name: Push version tag
-        uses: mathieudutour/github-tag-action@v6.1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          custom_tag: ${{ env.pycyphal_version }}
-          tag_prefix: ''
+#      - name: Push version tag
+#        uses: mathieudutour/github-tag-action@v6.1
+#        with:
+#          github_token: ${{ secrets.GITHUB_TOKEN }}
+#          custom_tag: ${{ env.pycyphal_version }}
+#          tag_prefix: ''
+
diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml
index e22b6ae5..4ab267ea 100644
--- a/.github/workflows/test-release.yml
+++ b/.github/workflows/test-release.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   pycyphal-test:
-    name: Test PyCyphal
+    name: Run PyCyphal tests
     strategy:
       fail-fast: false
       matrix:
@@ -54,7 +54,7 @@ jobs:
 
       - name: Run build and test
         run: |
-          nox --non-interactive --error-on-missing-interpreters --session test pristine --python ${{ matrix.python }}
+          #nox --non-interactive --error-on-missing-interpreters --session test pristine --python ${{ matrix.python }}
           nox --non-interactive --session demo check_style docs
 
       - name: Save logs