From 1ad37905302d05fa2d703bd1366dd4df026d1c36 Mon Sep 17 00:00:00 2001
From: Matthew Keeler <mkeeler@launchdarkly.com>
Date: Tue, 19 Nov 2024 12:22:26 -0500
Subject: [PATCH] chore: Fix broken pypi publish action

According to [this GitHub issue][1], the `pypa/gh-action-pypi-publish`
action cannot be used in nested actions. This commit inlines the usage
of this action into the top-level workflows instead.

[1]: https://github.com/pypa/gh-action-pypi-publish/issues/299
---
 .github/actions/publish/action.yml   | 18 ------------------
 .github/workflows/manual-publish.yml |  7 ++++---
 .github/workflows/release-please.yml |  6 +++---
 3 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 .github/actions/publish/action.yml

diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
deleted file mode 100644
index 60910ad..0000000
--- a/.github/actions/publish/action.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Publish Package
-description: 'Publish the package to PyPI'
-inputs:
-  token:
-    description: 'Token to use for publishing.'
-    required: true
-  dry_run:
-    description: 'Is this a dry run. If so no package will be published.'
-    required: true
-
-runs:
-  using: composite
-  steps:
-    - name: Publish package distributions to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      if: ${{ inputs.dry_run == 'false' }}
-      with:
-        password: ${{inputs.token}}
diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml
index 1865ba0..0967438 100644
--- a/.github/workflows/manual-publish.yml
+++ b/.github/workflows/manual-publish.yml
@@ -32,7 +32,8 @@ jobs:
 
       - uses: ./.github/actions/build
 
-      - uses: ./.github/actions/publish
+      - name: Publish package distributions to PyPI
+        if: ${{ inputs.dry_run == false }}
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          token: ${{env.PYPI_AUTH_TOKEN}}
-          dry_run: ${{ inputs.dry_run }}
+          password: ${{env.PYPI_AUTH_TOKEN}}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index f1a8745..6d55015 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -43,11 +43,11 @@ jobs:
       - uses: ./.github/actions/build-docs
         if: ${{ steps.release.outputs.releases_created == 'true' }}
 
-      - uses: ./.github/actions/publish
+      - name: Publish package distributions to PyPI
         if: ${{ steps.release.outputs.releases_created == 'true' }}
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          token: ${{env.PYPI_AUTH_TOKEN}}
-          dry_run: false
+          password: ${{env.PYPI_AUTH_TOKEN}}
 
       - uses: ./.github/actions/publish-docs
         if: ${{ steps.release.outputs.releases_created == 'true' }}