From 184ca2c1a8c1c8cd19dfdf6a79477e50a5f9e4f1 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 27 Oct 2023 11:39:52 +0800
Subject: [PATCH] Correct the naming of outputs.

---
 .github/workflows/publish.yaml | 16 ++++++++--------
 .github/workflows/release.yaml | 15 +++++++--------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 3bbd179..da23aa0 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -41,14 +41,14 @@ jobs:
         python -m pip install -U setuptools
         python -m pip install awscli
         # macOS build
-        curl -o macOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.output.TAG }}/Python-${{ steps.build-vars.output.PY_VERSION }}-macOS-support.${{ steps.build-vars.output.BUILD_NUMBER }}.tar.gz
-        aws s3 cp macOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.output.PY_VERSION }}/macOS/Python-${{ steps.build-vars.output.PY_VERSION }}-macOS-support.${{ steps.build-vars.output.BUILD_NUMBER }}.tar.gz
+        curl -o macOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.outputs.TAG }}/Python-${{ steps.build-vars.outputs.PY_VERSION }}-macOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
+        aws s3 cp macOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.outputs.PY_VERSION }}/macOS/Python-${{ steps.build-vars.outputs.PY_VERSION }}-macOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
         # iOS build
-        curl -o iOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.output.TAG }}/Python-${{ steps.build-vars.output.PY_VERSION }}-iOS-support.${{ steps.build-vars.output.BUILD_NUMBER }}.tar.gz
-        aws s3 cp iOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.output.PY_VERSION }}/iOS/Python-${{ steps.build-vars.output.PY_VERSION }}-iOS-support.${{ steps.build-vars.output.BUILD_NUMBER }}.tar.gz
+        curl -o iOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.outputs.TAG }}/Python-${{ steps.build-vars.outputs.PY_VERSION }}-iOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
+        aws s3 cp iOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.outputs.PY_VERSION }}/iOS/Python-${{ steps.build-vars.outputs.PY_VERSION }}-iOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
         # tvOS build
-        curl -o tvOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.output.TAG }}/Python-${{ steps.build-vars.output.PY_VERSION }}-tvOS-support.${{ steps.build-vars.output.BUILD_NUMBER }}.tar.gz
-        aws s3 cp tvOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.output.PY_VERSION }}/tvOS/Python-${{ steps.build-vars.output.PY_VERSION }}-tvOS-support.${{ steps.build-vars.output.BUILD_NUMBER }}.tar.gz
+        curl -o tvOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.outputs.TAG }}/Python-${{ steps.build-vars.outputs.PY_VERSION }}-tvOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
+        aws s3 cp tvOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.outputs.PY_VERSION }}/tvOS/Python-${{ steps.build-vars.outputs.PY_VERSION }}-tvOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
         # watchOS build
-        curl -o watchOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.output.TAG }}/Python-${{ steps.build-vars.output.PY_VERSION }}-watchOS-support.${{ steps.build-vars.output.BUILD_NUMBER }}.tar.gz
-        aws s3 cp watchOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.output.PY_VERSION }}/watchOS/Python-${{ steps.build-vars.output.PY_VERSION }}-watchOS-support.${{ steps.build-vars.output.BUILD_NUMBER }}.tar.gz
+        curl -o watchOS-artefact.tar.gz -L https://github.com/beeware/Python-Apple-support/releases/download/${{ steps.build-vars.outputs.TAG }}/Python-${{ steps.build-vars.outputs.PY_VERSION }}-watchOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
+        aws s3 cp watchOS-artefact.tar.gz s3://briefcase-support/python/${{ steps.build-vars.outputs.PY_VERSION }}/watchOS/Python-${{ steps.build-vars.outputs.PY_VERSION }}-watchOS-support.${{ steps.build-vars.outputs.BUILD_NUMBER }}.tar.gz
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 61aa8e3..3444886 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -8,7 +8,6 @@ on:
     - '*-b*'
 
 jobs:
-
   build:
     runs-on: macOS-latest
     outputs:
@@ -46,21 +45,21 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v4.7.1
       with:
-        python-version: "${{ steps.build-vars.output.PYTHON_VER }}-dev"
+        python-version: "${{ steps.build-vars.outputs.PYTHON_VER }}-dev"
 
     - name: Build ${{ matrix.target }}
       run: |
         # Do the build for the requested target.
-        make ${{ matrix.target }} BUILD_NUMBER=${{ steps.build-vars.output.BUILD_NUMBER }}
+        make ${{ matrix.target }} BUILD_NUMBER=${{ steps.build-vars.outputs.BUILD_NUMBER }}
 
     - name: Extract version details
       id: version-details
       run: |
-        export PYTHON_VERSION=$(grep "Python version:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 3)
-        export BZIP2_VERSION=$(grep "BZip2:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
-        export XZ_VERSION=$(grep "XZ:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
-        export OPENSSL_VERSION=$(grep "OpenSSL:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
-        export LIBFFI_VERSION=$(grep "libFFI:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
+        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}"