Update workflows with final fixes

Author: Genevieve Nuebel

.github/workflows/generate.yml

@@ -93,9 +93,9 @@ jobs:
           git config user.name "devexperience"
           git config user.email "devexperience@mx.com"
           git add .
-          git commit -m "Generated API ${{ github.event.inputs.api_version }} SDK for version ${{ steps.bump_version.outputs.version }}
+          git commit -m "Manually Generated API ${{ github.event.inputs.api_version }} SDK for version ${{ steps.bump_version.outputs.version }}
 
-          This pull request was automatically generated by a GitHub Action.
+          This pull request was automatically generated by generate GitHub Action.
           
           API Version: ${{ github.event.inputs.api_version }}
           SDK Version: ${{ steps.bump_version.outputs.version }}

.github/workflows/on-push-master.yml

@@ -17,8 +17,9 @@ jobs:
     steps:
       - name: Check for [skip-publish] flag in commit message
         id: check
+        env:
+          COMMIT_MSG: ${{ github.event.head_commit.message }}
         run: |
-          COMMIT_MSG="${{ github.event.head_commit.message }}"
           if [[ "$COMMIT_MSG" == *"[skip-publish]"* ]]; then
             echo "skip_publish=true" >> $GITHUB_OUTPUT
             echo "🚫 [skip-publish] flag detected - skipping all publish/release jobs"

.github/workflows/openapi-generate-and-push.yml

@@ -3,12 +3,6 @@ name: "OpenAPI: Automated Generate and Push"
 on:
   repository_dispatch:
     types: [generate_publish_release]
-  workflow_dispatch:
-    inputs:
-      payload_json:
-        description: 'JSON payload (e.g., {"api_versions":"v20111101","version":"patch","commit_sha":"abc123"})'
-        required: false
-        type: string
 
 jobs:
   Setup:
@@ -20,12 +14,7 @@ jobs:
       - name: Parse payload
         id: parse-payload
         run: |
-          # Parse workflow_dispatch payload if provided, otherwise use repository_dispatch payload
-          if [ -n "${{ github.event.inputs.payload_json }}" ]; then
-            VERSIONS=$(echo '${{ github.event.inputs.payload_json }}' | jq -r '.api_versions // "v20111101"')
-          else
-            VERSIONS="${{ github.event.client_payload.api_versions || 'v20111101' }}"
-          fi
+          VERSIONS="${{ github.event.client_payload.api_versions || 'v20111101' }}"
           echo "versions_to_generate=$VERSIONS" >> $GITHUB_OUTPUT
       
       - name: Set up matrix
@@ -77,13 +66,8 @@ jobs:
       - name: Bump version
         id: bump_version
         run: |
-          # Parse version from workflow_dispatch or repository_dispatch
-          if [ -n "${{ github.event.inputs.payload_json }}" ]; then
-            VERSION=$(echo '${{ github.event.inputs.payload_json }}' | jq -r '.version // "patch"')
-          else
-            VERSION="${{ github.event.client_payload.version || 'patch' }}"
-          fi
-          NEW_VERSION=$(ruby .github/version.rb "$VERSION" ${{ matrix.config_file }})
+          VERSION="${{ github.event.client_payload.version || 'patch' }}"
+          NEW_VERSION=$(ruby .github/version.rb $VERSION ${{ matrix.config_file }})
           echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
       - name: Clean repo
         run: ruby .github/clean.rb ${{ matrix.api_version }}
@@ -95,12 +79,7 @@ jobs:
         run: npm install @openapitools/openapi-generator-cli -g
       - name: Generate SDK
         run: |
-          # Parse commit_sha from workflow_dispatch or repository_dispatch
-          if [ -n "${{ github.event.inputs.payload_json }}" ]; then
-            COMMIT_SHA=$(echo '${{ github.event.inputs.payload_json }}' | jq -r '.commit_sha // "master"')
-          else
-            COMMIT_SHA="${{ github.event.client_payload.commit_sha || 'master' }}"
-          fi
+          COMMIT_SHA="${{ github.event.client_payload.commit_sha || 'master' }}"
           
           # Versioned spec URLs with commit SHA to avoid GitHub CDN cache race condition
           # Problem: GitHub's raw.githubusercontent.com CDN caches files for 5 minutes
@@ -113,11 +92,16 @@ jobs:
             -c ${{ matrix.config_file }} \
             -t ./openapi/templates \
             -o ./${{ matrix.api_version }}
-      - name: Upload artifacts
+      - name: Upload SDK artifacts
         uses: actions/upload-artifact@v4
         with:
           name: generated-${{ matrix.api_version }}
           path: ./${{ matrix.api_version }}
+      - name: Upload config artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: config-${{ matrix.api_version }}
+          path: ${{ matrix.config_file }}
 
   Process-and-Push:
     runs-on: ubuntu-latest
@@ -128,13 +112,33 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: ./generated
+      - name: Restore config files from artifacts
+        run: |
+          # Config files are bumped in the Generate job (separate runner).
+          # Restore them here so the version bump persists in the commit.
+          for dir in ./generated/config-*; do
+            [ -d "$dir" ] || continue
+            VERSION=$(basename "$dir" | sed 's/config-//')
+            CONFIG_FILE="openapi/config-${VERSION}.yml"
+            cp "$dir"/* "./$CONFIG_FILE" 2>/dev/null || echo "Config not found in $dir"
+            echo "Restored $CONFIG_FILE"
+          done
+
+          # Clean up config artifact directories so they don't get committed
+          rm -rf ./generated/config-*
       - name: Move generated files and track versions
         id: track_versions
         run: |
           GENERATED_VERSIONS=""
           
           for dir in ./generated/generated-*; do
             VERSION=$(basename "$dir" | sed 's/generated-//')
+
+            # Remove target directory before moving to prevent nesting
+            if [ -d "./$VERSION" ]; then
+              rm -rf "./$VERSION"
+            fi
+
             mv "$dir" "./$VERSION"
             GENERATED_VERSIONS="$GENERATED_VERSIONS $VERSION"
           done
@@ -170,9 +174,9 @@ jobs:
           git config user.name "devexperience"
           git config user.email "devexperience@mx.com"
           git add .
-          git commit -m "Generated SDK versions: ${{ needs.Setup.outputs.versions_to_generate }}
+          git commit -m "Automated Generated SDK versions: ${{ needs.Setup.outputs.versions_to_generate }}
 
-          This commit was automatically created by a GitHub Action."
+          This commit was automatically created by openapi-generate-and-push GitHub Action."
       - name: Push to master
         run: git push origin master
         env: