Skip to content

Commit 184ca2c

Browse files
freakboy3742freakboy3742
committed
Correct the naming of outputs.
1 parent c3cefc9 commit 184ca2c

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

‎.github/workflows/publish.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141
python -m pip install -U setuptools
4242
python -m pip install awscli
4343
# macOS build
44-
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
45-
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
44+
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
45+
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
4646
# iOS build
47-
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
48-
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
47+
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
48+
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
4949
# tvOS build
50-
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
51-
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
50+
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
51+
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
5252
# watchOS build
53-
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
54-
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
53+
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
54+
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

‎.github/workflows/release.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
- '*-b*'
99

1010
jobs:
11-
1211
build:
1312
runs-on: macOS-latest
1413
outputs:
@@ -46,21 +45,21 @@ jobs:
4645
- name: Set up Python
4746
uses: actions/[email protected]
4847
with:
49-
python-version: "${{ steps.build-vars.output.PYTHON_VER }}-dev"
48+
python-version: "${{ steps.build-vars.outputs.PYTHON_VER }}-dev"
5049

5150
- name: Build ${{ matrix.target }}
5251
run: |
5352
# Do the build for the requested target.
54-
make ${{ matrix.target }} BUILD_NUMBER=${{ steps.build-vars.output.BUILD_NUMBER }}
53+
make ${{ matrix.target }} BUILD_NUMBER=${{ steps.build-vars.outputs.BUILD_NUMBER }}
5554
5655
- name: Extract version details
5756
id: version-details
5857
run: |
59-
export PYTHON_VERSION=$(grep "Python version:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 3)
60-
export BZIP2_VERSION=$(grep "BZip2:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
61-
export XZ_VERSION=$(grep "XZ:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
62-
export OPENSSL_VERSION=$(grep "OpenSSL:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
63-
export LIBFFI_VERSION=$(grep "libFFI:" support/${{ steps.build-vars.output.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
58+
export PYTHON_VERSION=$(grep "Python version:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 3)
59+
export BZIP2_VERSION=$(grep "BZip2:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
60+
export XZ_VERSION=$(grep "XZ:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
61+
export OPENSSL_VERSION=$(grep "OpenSSL:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
62+
export LIBFFI_VERSION=$(grep "libFFI:" support/${{ steps.build-vars.outputs.PYTHON_VER }}/${{ matrix.target }}/VERSIONS | cut -d " " -f 2)
6463
6564
echo "PYTHON_VERSION=${PYTHON_VERSION}"
6665
echo "BZIP2_VERSION=${BZIP2_VERSION}"

0 commit comments

Comments
 (0)