package

Joaopeuko · Joaopeuko · commit 5ef8adfdf0cd · 2025-04-27T20:51:47.000+01:00
diff --git a/.github/workflows/deploy-pypi-packages.yaml b/.github/workflows/deploy-pypi-packages.yaml
@@ -56,7 +56,43 @@ jobs:
             echo "TAG_VERSION=$TAG_VERSION" >> $env:GITHUB_ENV
           }
 
-      - name: Build package
+      - name: Create temporary pyproject.toml for test build
+        if: startsWith(github.ref, 'refs/heads/')
+        run: |
+          # Read the current pyproject.toml
+          $content = Get-Content pyproject.toml -Raw
+
+          # Get the current version
+          $version = "${{ env.VERSION }}"
+          $suffix = "${{ env.SUFFIX }}"
+
+          # Update the version with the suffix
+          $newVersion = "$version.$suffix"
+
+          # Replace the version in the content
+          $updatedContent = $content -replace 'version = "(.*?)"', "version = `"$newVersion`""
+
+          # Save to a temporary file
+          $updatedContent | Out-File -FilePath pyproject.toml.temp -Encoding utf8
+
+          # Show the changes
+          Write-Host "Original version: $version"
+          Write-Host "Updated version: $newVersion"
+
+          # Backup original and replace with temp version
+          Move-Item -Path pyproject.toml -Destination pyproject.toml.bak -Force
+          Move-Item -Path pyproject.toml.temp -Destination pyproject.toml -Force
+
+      - name: Build package for Test PyPI
+        if: startsWith(github.ref, 'refs/heads/')
+        run: |
+          python -m build
+
+          # After building, restore the original pyproject.toml
+          Move-Item -Path pyproject.toml.bak -Destination pyproject.toml -Force
+
+      - name: Build package for PyPI
+        if: startsWith(github.ref, 'refs/tags/')
         run: |
           python -m build
 
@@ -69,26 +105,7 @@ jobs:
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TEST_PYPI }}
-          SUFFIX: ${{ env.SUFFIX }}
         run: |
-          # Rename wheel files to include suffix
-          Get-ChildItem dist/*.whl | ForEach-Object {
-            Write-Host "Original wheel: $_"
-            $suffix = $env:SUFFIX
-            $newName = $_.Name -replace '^(mqpy-\d+\.\d+\.\d+)-', "`$1.$suffix-"
-            Write-Host "Renaming to: $newName"
-            Rename-Item $_.FullName $newName
-          }
-
-          # Rename source tarballs
-          Get-ChildItem dist/*.tar.gz | ForEach-Object {
-            Write-Host "Original tarball: $_"
-            $suffix = $env:SUFFIX
-            $newName = $_.Name -replace '^(mqpy-\d+\.\d+\.\d+)', "`$1.$suffix"
-            Write-Host "Renaming to: $newName"
-            Rename-Item $_.FullName $newName
-          }
-
           Write-Host "Files ready for upload:"
           Get-ChildItem dist/* | ForEach-Object { Write-Host "  $_" }
 
@@ -107,6 +124,13 @@ jobs:
 
       - name: Create Step Summary
         run: |
+          # Set the display version based on the ref
+          if ("${{ github.ref }}".StartsWith("refs/tags/")) {
+            $displayVersion = "${{ env.TAG_VERSION }}"
+          } else {
+            $displayVersion = "${{ env.VERSION }}.${{ env.SUFFIX }}"
+          }
+
           @"
           # MQPy Package
 
@@ -142,7 +166,7 @@ jobs:
           This is a release candidate version published to Test PyPI.
 
           ```
-          pip install mqpy==${{ env.VERSION }}.${{ env.SUFFIX }} --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/
+          pip install mqpy==$displayVersion --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/
           ```
           "@
           })
diff --git a/.github/workflows/deploy-semantic-release.yaml b/.github/workflows/deploy-semantic-release.yaml
@@ -21,7 +21,7 @@ on:
 
 jobs:
   release:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     concurrency: release
     permissions:
       contents: write
@@ -34,14 +34,15 @@ jobs:
 
       - name: Set run mode
         id: set_mode
+        shell: bash
         run: |
-          $isDryRun = "${{ github.event_name == 'push' || inputs.dry_run }}" -eq "true"
-          echo "is_dry_run=$isDryRun" >> $env:GITHUB_OUTPUT
-          echo "Mode: $($isDryRun ? 'Dry run' : 'Full release')"
+          IS_DRY_RUN=$([ "${{ github.event_name }}" = "push" ] || [ "${{ inputs.dry_run }}" = "true" ] && echo "true" || echo "false")
+          echo "is_dry_run=$IS_DRY_RUN" >> $GITHUB_OUTPUT
+          echo "Mode: $([ "$IS_DRY_RUN" = "true" ] && echo "Dry run" || echo "Full release")"
 
       - name: Python Release - Dry Run
         id: release_dryrun
-        if: steps.set_mode.outputs.is_dry_run == 'True'
+        if: steps.set_mode.outputs.is_dry_run == 'true'
         uses: python-semantic-release/python-semantic-release@v9.20.0
         with:
             github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -62,31 +63,41 @@ jobs:
             root_options: ${{ inputs.debug && '-vv' || '-v' }}
 
       - name: Create Step Summary
+        shell: bash
         run: |
-          $isDryRun = "${{ steps.set_mode.outputs.is_dry_run }}" -eq "True"
-          $releaseId = $isDryRun ? "release_dryrun" : "release"
-          $wasReleased = "${{ steps.release_dryrun.outputs.released || steps.release.outputs.released }}" -eq "true"
-          $version = "${{ steps.release_dryrun.outputs.version || steps.release.outputs.version }}"
-          $tag = "${{ steps.release_dryrun.outputs.tag || steps.release.outputs.tag }}"
+          IS_DRY_RUN="${{ steps.set_mode.outputs.is_dry_run }}"
+          RELEASE_ID=$([ "$IS_DRY_RUN" = "true" ] && echo "release_dryrun" || echo "release")
+          WAS_RELEASED=$([ "${{ steps.release_dryrun.outputs.released || steps.release.outputs.released }}" = "true" ] && echo "Yes" || echo "No")
+          VERSION="${{ steps.release_dryrun.outputs.version || steps.release.outputs.version }}"
+          TAG="${{ steps.release_dryrun.outputs.tag || steps.release.outputs.tag }}"
 
           # Display trigger information
-          $triggerInfo = if ("${{ github.event_name }}" -eq "push") {
-            "Triggered by push to branch: ${{ github.ref_name }}"
-          } else {
-            "Triggered manually via workflow dispatch"
-          }
-
-          @"
-          # MQPy Release $($isDryRun ? "(Dry Run)" : "")
+          if [ "${{ github.event_name }}" = "push" ]; then
+            TRIGGER_INFO="Triggered by push to branch: ${{ github.ref_name }}"
+          else
+            TRIGGER_INFO="Triggered manually via workflow dispatch"
+          fi
+
+          # Create warning text for dry run
+          if [ "$IS_DRY_RUN" = "true" ]; then
+            DRY_RUN_TEXT="⚠️ This is a dry run - no changes were committed"
+            TITLE_SUFFIX=" (Dry Run)"
+          else
+            DRY_RUN_TEXT=""
+            TITLE_SUFFIX=""
+          fi
+
+          cat > $GITHUB_STEP_SUMMARY << EOF
+          # MQPy Release$TITLE_SUFFIX
 
           ## Release Summary
 
-          $triggerInfo
-          $($isDryRun ? "⚠️ This is a dry run - no changes were committed" : "")
+          $TRIGGER_INFO
+          $DRY_RUN_TEXT
 
-          Current/Next Version: $version
-          Current/Next Tag: $tag
-          Release required: $($wasReleased ? "Yes" : "No")
+          Current/Next Version: $VERSION
+          Current/Next Tag: $TAG
+          Release required: $WAS_RELEASED
 
           ## Installation Instructions
 
@@ -105,10 +116,10 @@ jobs:
 
           ### Installation Steps
 
-          ```
-          pip install mqpy==$version
-          ```
+          \`\`\`
+          pip install mqpy==$VERSION
+          \`\`\`
 
           ### Documentation
           For complete documentation, visit our [GitHub repository](https://github.com/Joaopeuko/Mql5-Python-Integration).
-          "@ | Out-File -FilePath $env:GITHUB_STEP_SUMMARY
+          EOF
