Update syntax for github outputs.

beeware · Nov 20, 2023 · 323aa5f · 323aa5f
1 parent b8fcfd7
commit 323aa5f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 36 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -20,17 +20,13 @@ jobs:
       env:
         TAG_NAME: ${{ github.ref }}
       run: |
-        export TAG=$(basename $TAG_NAME)
-        echo "TAG=${TAG}"
-        export PYTHON_VER="${TAG%-*}"
-        export BUILD_NUMBER="${TAG#*-}"
+        TAG=$(basename $TAG_NAME)
+        PYTHON_VER="${TAG%-*}"
+        BUILD_NUMBER="${TAG#*-}"
 
-        echo "PYTHON_VER=${PYTHON_VER}"
-        echo "BUILD_NUMBER=${BUILD_NUMBER}"
-
-        echo "TAG=${TAG}" >> ${GITHUB_OUTPUT}
-        echo "PYTHON_VER=${PYTHON_VER}" >> ${GITHUB_OUTPUT}
-        echo "BUILD_NUMBER=${BUILD_NUMBER}" >> ${GITHUB_OUTPUT}
+        echo "TAG=${TAG}" | tee -a ${GITHUB_OUTPUT}
+        echo "PYTHON_VER=${PYTHON_VER}" | tee -a ${GITHUB_OUTPUT}
+        echo "BUILD_NUMBER=${BUILD_NUMBER}" | tee -a ${GITHUB_OUTPUT}
 
     - name: Update Release Asset to S3
       env:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -30,17 +30,13 @@ jobs:
       env:
         TAG_NAME: ${{ github.ref }}
       run: |
-        export TAG=$(basename $TAG_NAME)
-        echo "TAG=${TAG}"
-        export PYTHON_VER="${TAG%-*}"
-        export BUILD_NUMBER="${TAG#*-}"
+        TAG=$(basename $TAG_NAME)
+        echo "TAG=${TAG}" | tee -a ${GITHUB_OUTPUT}
 
-        echo "PYTHON_VER=${PYTHON_VER}"
-        echo "BUILD_NUMBER=${BUILD_NUMBER}"
-
-        echo "TAG=${TAG}" >> ${GITHUB_OUTPUT}
-        echo "PYTHON_VER=${PYTHON_VER}" >> ${GITHUB_OUTPUT}
-        echo "BUILD_NUMBER=${BUILD_NUMBER}" >> ${GITHUB_OUTPUT}
+        PYTHON_VER="${TAG%-*}"
+        BUILD_NUMBER="${TAG#*-}"
+        echo "PYTHON_VER=${PYTHON_VER}" | tee -a ${GITHUB_OUTPUT}
+        echo "BUILD_NUMBER=${BUILD_NUMBER}" | tee -a ${GITHUB_OUTPUT}
 
     - name: Set up Python
       uses: actions/[email protected]
@@ -55,23 +51,17 @@ jobs:
     - name: Extract version details
       id: version-details
       run: |
-        export PYTHON_VERSION=$(grep "Python version:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 3)
-        export BZIP2_VERSION=$(grep "BZip2:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
-        export XZ_VERSION=$(grep "XZ:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
-        export OPENSSL_VERSION=$(grep "OpenSSL:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
-        export LIBFFI_VERSION=$(grep "libFFI:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
-
-        echo "PYTHON_VERSION=${PYTHON_VERSION}"
-        echo "BZIP2_VERSION=${BZIP2_VERSION}"
-        echo "XZ_VERSION=${XZ_VERSION}"
-        echo "OPENSSL_VERSION=${OPENSSL_VERSION}"
-        echo "LIBFFI_VERSION=${LIBFFI_VERSION}"
+        PYTHON_VERSION=$(grep "Python version:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 3)
+        BZIP2_VERSION=$(grep "BZip2:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
+        XZ_VERSION=$(grep "XZ:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
+        OPENSSL_VERSION=$(grep "OpenSSL:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
+        LIBFFI_VERSION=$(grep "libFFI:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
 
-        echo "PYTHON_VERSION=${PYTHON_VERSION}" >> ${GITHUB_OUTPUT}
-        echo "BZIP2_VERSION=${BZIP2_VERSION}" >> ${GITHUB_OUTPUT}
-        echo "XZ_VERSION=${XZ_VERSION}" >> ${GITHUB_OUTPUT}
-        echo "OPENSSL_VERSION=${OPENSSL_VERSION}" >> ${GITHUB_OUTPUT}
-        echo "LIBFFI_VERSION=${LIBFFI_VERSION}" >> ${GITHUB_OUTPUT}
+        echo "PYTHON_VERSION=${PYTHON_VERSION}" | tee -a ${GITHUB_OUTPUT}
+        echo "BZIP2_VERSION=${BZIP2_VERSION}" | tee -a ${GITHUB_OUTPUT}
+        echo "XZ_VERSION=${XZ_VERSION}" | tee -a ${GITHUB_OUTPUT}
+        echo "OPENSSL_VERSION=${OPENSSL_VERSION}" | tee -a ${GITHUB_OUTPUT}
+        echo "LIBFFI_VERSION=${LIBFFI_VERSION}" | tee -a ${GITHUB_OUTPUT}
 
     - name: Upload build artifact
       uses: actions/[email protected]