From d45ff5532410551eb3d2ad7c201517b1263c7c3b Mon Sep 17 00:00:00 2001
From: erikhuck <erik.huckvale2017@gmail.com>
Date: Thu, 18 Apr 2024 16:53:27 -0400
Subject: [PATCH] Adds documentation publishing to package release

---
 .github/workflows/documentation.yml   |  7 ++-----
 .github/workflows/package_release.yml | 22 ++++++++++++++++------
 .github/workflows/pull_request.yml    | 19 +++----------------
 .github/workflows/pypi.yml            |  4 ++--
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index aa6d931..a098c8f 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -8,12 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
-        fetch-tags: true
-    - name: Set up Python 3.11
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.11'
+        python-version: '3.x'
     - name: Upgrade pip, install package, install requirements, build docs
       run: |
         pip install --upgrade pip
diff --git a/.github/workflows/package_release.yml b/.github/workflows/package_release.yml
index 8503f65..c56967e 100644
--- a/.github/workflows/package_release.yml
+++ b/.github/workflows/package_release.yml
@@ -21,14 +21,24 @@ jobs:
     with:
       repository_url: https://test.pypi.org/legacy/
     secrets:
-      PYPI_API_TOKEN: ${{ secrets.TEST_PYPI_API_TOKEN }}
+      API_TOKEN: ${{ secrets.TEST_PYPI_API_TOKEN }}
   test-test-pypi:
     needs: [release-version, publish-test-pypi]
     uses: ./.github/workflows/tests.yml
     with:
       install_command: "python3 -m pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple gpu-tracker==${{ needs.release-version.outputs.version }}"
-
-#      - name: Publish package to PyPi
-#        uses: pypa/gh-action-pypi-publish@release/v1
-#        with:
-#          password: ${{ secrets.PYPI_API_TOKEN }}
+  publish-pypi:
+    needs: test-test-pypi
+    uses: ./.github/workflows/pypi.yml
+    with:
+      repository_url: https://upload.pypi.org/legacy/
+    secrets:
+      API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+  test-pypi:
+    needs: [release-version, publish-pypi]
+    uses: ./.github/workflows/tests.yml
+    with:
+      install_command: "python3 -m pip install gpu-tracker==${{ needs.release-version.outputs.version }}"
+  publish-documentation:
+    needs: test-pypi
+    uses: ./.github/workflows/documentation.yml
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 243ce6c..eebdbe2 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -10,20 +10,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.11", "3.12"]
-        os: [ ubuntu-latest, windows-latest, macOS-latest ]
-    runs-on: ${{matrix.os}}
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+  pull-request:
+      uses: ./.github/workflows/tests.yml
       with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install testing environment and gpu-tracker package
-      run: bash tests/install.sh
-    - name: Test with pytest
-      run: bash tests/run.sh
+        install_command: "python3 -m pip install -e ."
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
index e5bed51..ca440a6 100644
--- a/.github/workflows/pypi.yml
+++ b/.github/workflows/pypi.yml
@@ -8,7 +8,7 @@ on:
         required: true
         type: string
     secrets:
-      PYPI_API_TOKEN:
+      API_TOKEN:
         required: true
 
 jobs:
@@ -28,5 +28,5 @@ jobs:
       - name: Publish package to a PyPi distribution
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          password: ${{ secrets.API_TOKEN }}
           repository-url: ${{ inputs.repository_url }}