fix the release process

pantsbuild · Feb 17, 2025 · ce4f5fb · ce4f5fb
1 parent 31c19f3
commit ce4f5fb
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 49 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -84,10 +84,21 @@ jobs:
         subject-path: dist/deploy/wheels/pantsbuild.pants/**/pantsbuild.pants-*.whl
     - if: needs.release_info.outputs.is-release == 'true'
       name: Rename the Pants Pex to its final name for upload
-      run: 'PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+      run: 'PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import
+        pants.version;print(pants.version.VERSION)")
+
+        PY_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import
+        sys;print(f''cp{sys.version_info[0]}{sys.version_info[1]}'')")
+
+        PLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import os;print(f''{os.uname().sysname.lower()}_{os.uname().machine.lower()}'')")
+
+        PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+
 
         mv dist/src.python.pants/pants-pex.pex dist/src.python.pants/$PEX_FILENAME
 
+        echo "PEX_FILENAME=$PEX_FILENAME" >> "$GITHUB_ENV"
+
         '
     - continue-on-error: true
       if: needs.release_info.outputs.is-release == 'true'
@@ -97,16 +108,11 @@ jobs:
         subject-path: dist/src.python.pants/*.pex
     - if: needs.release_info.outputs.is-release == 'true'
       name: Upload Wheel and Pex
-      run: "PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c \"\
-        import pants.version;print(pants.version.VERSION)\")\nPY_VER=$(PEX_INTERPRETER=1\
-        \ dist/src.python.pants/pants-pex.pex -c \"import sys;print(f'cp{sys.version_info[0]}{sys.version_info[1]}')\"\
-        )\nPLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c \"import\
-        \ os;print(f'{os.uname().sysname.lower()}_{os.uname().machine.lower()}')\"\
-        )\nPEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex\n\ncurl -L --fail \\\n\
-        \    -X POST \\\n    -H \"Authorization: Bearer ${{ github.token }}\" \\\n\
-        \    -H \"Content-Type: application/octet-stream\" \\\n    ${{ needs.release_info.outputs.release-asset-upload-url\
-        \ }}?name=$PEX_FILENAME \\\n    --data-binary \"@dist/src.python.pants/$PEX_FILENAME\"\
-        \n\nWHL=$(find dist/deploy/wheels/pantsbuild.pants -type f -name \"pantsbuild.pants-*.whl\"\
+      run: "curl -L --fail \\\n    -X POST \\\n    -H \"Authorization: Bearer ${{\
+        \ github.token }}\" \\\n    -H \"Content-Type: application/octet-stream\"\
+        \ \\\n    ${{ needs.release_info.outputs.release-asset-upload-url }}?name=$PEX_FILENAME\
+        \ \\\n    --data-binary \"@dist/src.python.pants/$PEX_FILENAME\"\n\nWHL=$(find\
+        \ dist/deploy/wheels/pantsbuild.pants -type f -name \"pantsbuild.pants-*.whl\"\
         )\ncurl -L --fail \\\n    -X POST \\\n    -H \"Authorization: Bearer ${{ github.token\
         \ }}\" \\\n    -H \"Content-Type: application/octet-stream\" \\\n    \"${{\
         \ needs.release_info.outputs.release-asset-upload-url }}?name=$(basename $WHL)\"\
@@ -192,10 +198,21 @@ jobs:
         subject-path: dist/deploy/wheels/pantsbuild.pants/**/pantsbuild.pants-*.whl
     - if: needs.release_info.outputs.is-release == 'true'
       name: Rename the Pants Pex to its final name for upload
-      run: 'PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+      run: 'PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import
+        pants.version;print(pants.version.VERSION)")
+
+        PY_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import
+        sys;print(f''cp{sys.version_info[0]}{sys.version_info[1]}'')")
+
+        PLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import os;print(f''{os.uname().sysname.lower()}_{os.uname().machine.lower()}'')")
+
+        PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+
 
         mv dist/src.python.pants/pants-pex.pex dist/src.python.pants/$PEX_FILENAME
 
+        echo "PEX_FILENAME=$PEX_FILENAME" >> "$GITHUB_ENV"
+
         '
     - continue-on-error: true
       if: needs.release_info.outputs.is-release == 'true'
@@ -205,16 +222,11 @@ jobs:
         subject-path: dist/src.python.pants/*.pex
     - if: needs.release_info.outputs.is-release == 'true'
       name: Upload Wheel and Pex
-      run: "PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c \"\
-        import pants.version;print(pants.version.VERSION)\")\nPY_VER=$(PEX_INTERPRETER=1\
-        \ dist/src.python.pants/pants-pex.pex -c \"import sys;print(f'cp{sys.version_info[0]}{sys.version_info[1]}')\"\
-        )\nPLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c \"import\
-        \ os;print(f'{os.uname().sysname.lower()}_{os.uname().machine.lower()}')\"\
-        )\nPEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex\n\ncurl -L --fail \\\n\
-        \    -X POST \\\n    -H \"Authorization: Bearer ${{ github.token }}\" \\\n\
-        \    -H \"Content-Type: application/octet-stream\" \\\n    ${{ needs.release_info.outputs.release-asset-upload-url\
-        \ }}?name=$PEX_FILENAME \\\n    --data-binary \"@dist/src.python.pants/$PEX_FILENAME\"\
-        \n\nWHL=$(find dist/deploy/wheels/pantsbuild.pants -type f -name \"pantsbuild.pants-*.whl\"\
+      run: "curl -L --fail \\\n    -X POST \\\n    -H \"Authorization: Bearer ${{\
+        \ github.token }}\" \\\n    -H \"Content-Type: application/octet-stream\"\
+        \ \\\n    ${{ needs.release_info.outputs.release-asset-upload-url }}?name=$PEX_FILENAME\
+        \ \\\n    --data-binary \"@dist/src.python.pants/$PEX_FILENAME\"\n\nWHL=$(find\
+        \ dist/deploy/wheels/pantsbuild.pants -type f -name \"pantsbuild.pants-*.whl\"\
         )\ncurl -L --fail \\\n    -X POST \\\n    -H \"Authorization: Bearer ${{ github.token\
         \ }}\" \\\n    -H \"Content-Type: application/octet-stream\" \\\n    \"${{\
         \ needs.release_info.outputs.release-asset-upload-url }}?name=$(basename $WHL)\"\
@@ -329,10 +341,21 @@ jobs:
         subject-path: dist/deploy/wheels/pantsbuild.pants/**/pantsbuild.pants-*.whl
     - if: needs.release_info.outputs.is-release == 'true'
       name: Rename the Pants Pex to its final name for upload
-      run: 'PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+      run: 'PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import
+        pants.version;print(pants.version.VERSION)")
+
+        PY_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import
+        sys;print(f''cp{sys.version_info[0]}{sys.version_info[1]}'')")
+
+        PLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import os;print(f''{os.uname().sysname.lower()}_{os.uname().machine.lower()}'')")
+
+        PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+
 
         mv dist/src.python.pants/pants-pex.pex dist/src.python.pants/$PEX_FILENAME
 
+        echo "PEX_FILENAME=$PEX_FILENAME" >> "$GITHUB_ENV"
+
         '
     - continue-on-error: true
       if: needs.release_info.outputs.is-release == 'true'
@@ -342,16 +365,11 @@ jobs:
         subject-path: dist/src.python.pants/*.pex
     - if: needs.release_info.outputs.is-release == 'true'
       name: Upload Wheel and Pex
-      run: "PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c \"\
-        import pants.version;print(pants.version.VERSION)\")\nPY_VER=$(PEX_INTERPRETER=1\
-        \ dist/src.python.pants/pants-pex.pex -c \"import sys;print(f'cp{sys.version_info[0]}{sys.version_info[1]}')\"\
-        )\nPLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c \"import\
-        \ os;print(f'{os.uname().sysname.lower()}_{os.uname().machine.lower()}')\"\
-        )\nPEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex\n\ncurl -L --fail \\\n\
-        \    -X POST \\\n    -H \"Authorization: Bearer ${{ github.token }}\" \\\n\
-        \    -H \"Content-Type: application/octet-stream\" \\\n    ${{ needs.release_info.outputs.release-asset-upload-url\
-        \ }}?name=$PEX_FILENAME \\\n    --data-binary \"@dist/src.python.pants/$PEX_FILENAME\"\
-        \n\nWHL=$(find dist/deploy/wheels/pantsbuild.pants -type f -name \"pantsbuild.pants-*.whl\"\
+      run: "curl -L --fail \\\n    -X POST \\\n    -H \"Authorization: Bearer ${{\
+        \ github.token }}\" \\\n    -H \"Content-Type: application/octet-stream\"\
+        \ \\\n    ${{ needs.release_info.outputs.release-asset-upload-url }}?name=$PEX_FILENAME\
+        \ \\\n    --data-binary \"@dist/src.python.pants/$PEX_FILENAME\"\n\nWHL=$(find\
+        \ dist/deploy/wheels/pantsbuild.pants -type f -name \"pantsbuild.pants-*.whl\"\
         )\ncurl -L --fail \\\n    -X POST \\\n    -H \"Authorization: Bearer ${{ github.token\
         \ }}\" \\\n    -H \"Content-Type: application/octet-stream\" \\\n    \"${{\
         \ needs.release_info.outputs.release-asset-upload-url }}?name=$(basename $WHL)\"\
@@ -449,10 +467,21 @@ jobs:
         subject-path: dist/deploy/wheels/pantsbuild.pants/**/pantsbuild.pants-*.whl
     - if: needs.release_info.outputs.is-release == 'true'
       name: Rename the Pants Pex to its final name for upload
-      run: 'PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+      run: 'PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import
+        pants.version;print(pants.version.VERSION)")
+
+        PY_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import
+        sys;print(f''cp{sys.version_info[0]}{sys.version_info[1]}'')")
+
+        PLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import os;print(f''{os.uname().sysname.lower()}_{os.uname().machine.lower()}'')")
+
+        PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+
 
         mv dist/src.python.pants/pants-pex.pex dist/src.python.pants/$PEX_FILENAME
 
+        echo "PEX_FILENAME=$PEX_FILENAME" >> "$GITHUB_ENV"
+
         '
     - continue-on-error: true
       if: needs.release_info.outputs.is-release == 'true'
@@ -462,16 +491,11 @@ jobs:
         subject-path: dist/src.python.pants/*.pex
     - if: needs.release_info.outputs.is-release == 'true'
       name: Upload Wheel and Pex
-      run: "PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c \"\
-        import pants.version;print(pants.version.VERSION)\")\nPY_VER=$(PEX_INTERPRETER=1\
-        \ dist/src.python.pants/pants-pex.pex -c \"import sys;print(f'cp{sys.version_info[0]}{sys.version_info[1]}')\"\
-        )\nPLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c \"import\
-        \ os;print(f'{os.uname().sysname.lower()}_{os.uname().machine.lower()}')\"\
-        )\nPEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex\n\ncurl -L --fail \\\n\
-        \    -X POST \\\n    -H \"Authorization: Bearer ${{ github.token }}\" \\\n\
-        \    -H \"Content-Type: application/octet-stream\" \\\n    ${{ needs.release_info.outputs.release-asset-upload-url\
-        \ }}?name=$PEX_FILENAME \\\n    --data-binary \"@dist/src.python.pants/$PEX_FILENAME\"\
-        \n\nWHL=$(find dist/deploy/wheels/pantsbuild.pants -type f -name \"pantsbuild.pants-*.whl\"\
+      run: "curl -L --fail \\\n    -X POST \\\n    -H \"Authorization: Bearer ${{\
+        \ github.token }}\" \\\n    -H \"Content-Type: application/octet-stream\"\
+        \ \\\n    ${{ needs.release_info.outputs.release-asset-upload-url }}?name=$PEX_FILENAME\
+        \ \\\n    --data-binary \"@dist/src.python.pants/$PEX_FILENAME\"\n\nWHL=$(find\
+        \ dist/deploy/wheels/pantsbuild.pants -type f -name \"pantsbuild.pants-*.whl\"\
         )\ncurl -L --fail \\\n    -X POST \\\n    -H \"Authorization: Bearer ${{ github.token\
         \ }}\" \\\n    -H \"Content-Type: application/octet-stream\" \\\n    \"${{\
         \ needs.release_info.outputs.release-asset-upload-url }}?name=$(basename $WHL)\"\

diff --git a/src/python/pants_release/generate_github_workflows.py b/src/python/pants_release/generate_github_workflows.py
@@ -932,8 +932,13 @@ def build_wheels_job(
                             "if": "needs.release_info.outputs.is-release == 'true'",
                             "run": dedent(
                                 """\
+                                PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import pants.version;print(pants.version.VERSION)")
+                                PY_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import sys;print(f'cp{sys.version_info[0]}{sys.version_info[1]}')")
+                                PLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import os;print(f'{os.uname().sysname.lower()}_{os.uname().machine.lower()}')")
                                 PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
+
                                 mv dist/src.python.pants/pants-pex.pex dist/src.python.pants/$PEX_FILENAME
+                                echo "PEX_FILENAME=$PEX_FILENAME" >> "$GITHUB_ENV"
                                 """
                             ),
                         },
@@ -956,11 +961,6 @@ def build_wheels_job(
                             #   support. `curl` is a good lowest-common-denominator way to upload the assets.
                             "run": dedent(
                                 """\
-                                PANTS_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import pants.version;print(pants.version.VERSION)")
-                                PY_VER=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import sys;print(f'cp{sys.version_info[0]}{sys.version_info[1]}')")
-                                PLAT=$(PEX_INTERPRETER=1 dist/src.python.pants/pants-pex.pex -c "import os;print(f'{os.uname().sysname.lower()}_{os.uname().machine.lower()}')")
-                                PEX_FILENAME=pants.$PANTS_VER-$PY_VER-$PLAT.pex
-
                                 curl -L --fail \\
                                     -X POST \\
                                     -H "Authorization: Bearer ${{ github.token }}" \\