add publishing workflows

salt-extensions · Dec 27, 2023 · 0a23425 · 0a23425
1 parent 7be5b5d
commit 0a23425
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 69 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,63 +46,45 @@ jobs:
     with:
       changed-files: ${{ needs.get-changed-files.outputs.changed-files }}
 
-#  build-python-package:
-#    name: Python Package
-#    if: ${{ inputs.release && success() }}
-#    uses: salt-extensions/central-artifacts/.github/workflows/package-action.yml@main
-#    needs:
-#      - pre-commit
-#    with:
-#      version: "${{ inputs.version }}"
-#
-#  deploy-python-package-test-pypi:
-#    name: Deploy Python Package (Test PyPI)
-#    uses: salt-extensions/central-artifacts/.github/workflows/deploy-package-action.yml@main
-#    if: ${{ inputs.release && success() }}
-#    needs:
-#      - pre-commit
-#      - test
-#      - docs
-#      - build-python-package
-#    secrets:
-#      TEST_PYPI_API_TOKEN: "${{ secrets.TEST_PYPI_API_TOKEN }}"
-#    with:
-#      version: "${{ inputs.version }}"
-#
-#  deploy-python-package:
-#    name: Deploy Python Package (PyPI)
-#    uses: salt-extensions/central-artifacts/.github/workflows/deploy-package-action.yml@main
-#    if: ${{ inputs.release && success() }}
-#    needs:
-#      - pre-commit
-#      - test
-#      - docs
-#      - build-python-package
-#      - deploy-python-package-test-pypi
-#    secrets:
-#      PYPI_API_TOKEN: "${{ secrets.PYPI_API_TOKEN }}"
-#    with:
-#      test: false
-#      version: "${{ inputs.version }}"
-#
-#  push-tag:
-#    name: Push Version Tag
-#    runs-on: ubuntu-latest
-#    permissions:
-#      contents: write
-#    if: ${{ inputs.release && success() }}
-#    needs:
-#      - build-python-package
-#      - deploy-python-package
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v3
-#      - name: Push Tag
-#        uses: rickstaa/action-create-tag@v1
-#        with:
-#          tag: "v${{ inputs.version }}"
-#          message: "Version ${{ inputs.version }}"
-#
+  build-python-package:
+    name: Python Package
+    if: ${{ inputs.release && success() }}
+    uses: salt-extensions/central-artifacts/.github/workflows/package-action.yml@main
+    needs:
+      - pre-commit
+    with:
+      version: "${{ inputs.version }}"
+
+  deploy-python-package-test-pypi:
+    name: Deploy Python Package (Test PyPI)
+    uses: salt-extensions/central-artifacts/.github/workflows/deploy-package-action.yml@main
+    if: ${{ inputs.release && success() }}
+    needs:
+      - pre-commit
+      - test
+      - docs
+      - build-python-package
+    secrets:
+      TEST_PYPI_API_TOKEN: "${{ secrets.TEST_PYPI_API_TOKEN }}"
+    with:
+      version: "${{ inputs.version }}"
+
+  deploy-python-package:
+    name: Deploy Python Package (PyPI)
+    uses: salt-extensions/central-artifacts/.github/workflows/deploy-package-action.yml@main
+    if: ${{ inputs.release && success() }}
+    needs:
+      - pre-commit
+      - test
+      - docs
+      - build-python-package
+      - deploy-python-package-test-pypi
+    secrets:
+      PYPI_API_TOKEN: "${{ secrets.PYPI_API_TOKEN }}"
+    with:
+      test: false
+      version: "${{ inputs.version }}"
+
   set-pipeline-exit-status:
     # This step is just so we can make github require this step, to pass checks
     # on a pull request instead of requiring all
@@ -113,10 +95,9 @@ jobs:
       - pre-commit
       - test
       - docs
-#      - build-python-package
-#      - deploy-python-package-test-pypi
-#      - deploy-python-package
-#      - push-tag
+      - build-python-package
+      - deploy-python-package-test-pypi
+      - deploy-python-package
     steps:
     - name: Download Exit Status Files
       if: always()

diff --git a/.github/workflows/deploy-package-action.yml b/.github/workflows/deploy-package-action.yml
@@ -0,0 +1,41 @@
+name: Deploy Salt Extension Python Package
+
+on:
+  workflow_call:
+    inputs:
+      test:
+        type: boolean
+        required: false
+        default: true
+      version:
+        type: string
+        required: true
+    secrets:
+      PYPI_API_TOKEN:
+        required: false
+      TEST_PYPI_API_TOKEN:
+        required: false
+
+jobs:
+  build:
+    name: Publish Python Package to ${{ fromJSON('["PyPI", "Test PyPI"]')[inputs.test] }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Python Package Artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: salt-extension-${{ inputs.version }}-packages
+          path: dist
+
+      - name: Publish distribution to Test PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        if: ${{ inputs.test }}
+        with:
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          repository-url: https://test.pypi.org/legacy/
+
+      - name: Publish distribution to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        if: ${{ !inputs.test }}
+        with:
+          password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/docs-action.yml b/.github/workflows/docs-action.yml
@@ -16,10 +16,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Python 3.7 For Nox
+    - name: Set up Python 3.10 For Nox
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: "3.10"
 
     - name: Install Nox
       run: |
@@ -41,3 +41,11 @@ jobs:
       run: |
         mkdir exitstatus
         echo "${{ job.status }}" > exitstatus/${{ github.job }}
+
+    - name: Upload Exit Status
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        name: exitstatus
+        path: exitstatus
+        if-no-files-found: error
diff --git a/.github/workflows/get-changed-files.yml b/.github/workflows/get-changed-files.yml
@@ -11,7 +11,7 @@ jobs:
     outputs:
       changed-files: ${{ toJSON(steps.changed-files.outputs) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get Changed Files
         id: changed-files
         uses: dorny/paths-filter@v2

diff --git a/.github/workflows/package-action.yml b/.github/workflows/package-action.yml
@@ -0,0 +1,50 @@
+name: Salt Extension Python Package
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
+
+jobs:
+  build:
+    name: Build Python Packages (wheel and sdist)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install build
+        run: >-
+          python -m
+          pip install
+          build
+          --user
+
+      - name: Echo Version
+        run: echo "${{ inputs.version }}"
+
+      - name: Setup Version
+        run: echo "${{ inputs.version }}" > version.txt
+
+      - name: Build Wheel
+        run: python -m build --outdir dist/
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: salt-extension-${{ inputs.version }}-packages
+          path: dist/*
+          retention-days: 5
+
+      - name: Set Exit Status
+        if: always()
+        run: |
+          mkdir exitstatus
+          echo "${{ job.status }}" > exitstatus/${{ github.job }}
diff --git a/.github/workflows/central.yml → .github/workflows/pipeline.yml b/.github/workflows/central.yml → .github/workflows/pipeline.yml
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 5
       matrix:
         python-version:
           - '3.8'
@@ -134,7 +134,16 @@ jobs:
       if: always()
       run: |
         mkdir exitstatus
-        echo "${{ job.status }}" > exitstatus/${{ github.job }}
+        echo "${{ job.status }}" > exitstatus/${{ github.job }}-Py{{ matrix.python-version }}-Salt{{ matrix.salt-version }}
+
+    - name: Upload Exit Status
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        name: exitstatus
+        path: exitstatus
+        if-no-files-found: error
+
 
   Windows:
     runs-on: windows-latest
@@ -263,7 +272,7 @@ jobs:
 
     - name: Upload Logs
       if: always()
-      uses: actions/upload-artifact@main
+      uses: actions/upload-artifact@v3
       with:
         name: runtests-${{ runner.os }}-py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}.log
         path: artifacts/runtests-*.log
@@ -272,7 +281,15 @@ jobs:
       if: always()
       run: |
         mkdir exitstatus
-        echo "${{ job.status }}" > exitstatus/${{ github.job }}
+        echo "${{ job.status }}" > exitstatus/${{ github.job }}-Py{{ matrix.python-version }}-Salt{{ matrix.salt-version }}
+
+    - name: Upload Exit Status
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        name: exitstatus
+        path: exitstatus
+        if-no-files-found: error
 
   macOS:
     runs-on: macOS-latest
@@ -395,4 +412,12 @@ jobs:
       if: always()
       run: |
         mkdir exitstatus
-        echo "${{ job.status }}" > exitstatus/${{ github.job }}
+        echo "${{ job.status }}" > exitstatus/${{ github.job }}-Py{{ matrix.python-version }}-Salt{{ matrix.salt-version }}
+
+    - name: Upload Exit Status
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        name: exitstatus
+        path: exitstatus
+        if-no-files-found: error