Skip to content

Commit 48ee5c3

Browse files
authored
Merge pull request #15 from matthew-brett/rename-vars
Rename vars
2 parents 0fe616f + ad06ec8 commit 48ee5c3

File tree

10 files changed

+98
-92
lines changed

10 files changed

+98
-92
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ jobs:
6565
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
6666
- run: ./tools/calculate_installer_hash.sh
6767
- run: |
68-
installer -verbose -pkginfo -pkg ./${SP_INSTALLER_NAME}
69-
installer -verbose -dominfo -pkg ./${SP_INSTALLER_NAME}
70-
installer -verbose -volinfo -pkg ./${SP_INSTALLER_NAME}
68+
installer -verbose -pkginfo -pkg ./${PKG_INSTALLER_NAME}
69+
installer -verbose -dominfo -pkg ./${PKG_INSTALLER_NAME}
70+
installer -verbose -volinfo -pkg ./${PKG_INSTALLER_NAME}
7171
- uses: actions/upload-artifact@v4
7272
with:
73-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}
73+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}
7474
path: ${{ env.PROJECT_NAME }}-*.*
7575
retention-days: ${{ env.ARTIFACT_RETENTION_DAYS }}
7676

@@ -96,7 +96,7 @@ jobs:
9696
- run: ./tools/calculate_installer_hash.sh
9797
- uses: actions/upload-artifact@v4
9898
with:
99-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}
99+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}
100100
path: ${{ env.PROJECT_NAME }}-*.*
101101
retention-days: ${{ env.ARTIFACT_RETENTION_DAYS }}
102102

@@ -124,7 +124,7 @@ jobs:
124124
- run: ./tools/calculate_installer_hash.sh
125125
- uses: actions/upload-artifact@v4
126126
with:
127-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}
127+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}
128128
path: ${{ env.PROJECT_NAME }}-*.*
129129
retention-days: ${{ env.ARTIFACT_RETENTION_DAYS }}
130130

@@ -151,16 +151,16 @@ jobs:
151151
- run: ./tools/extract_version.sh
152152
- uses: actions/download-artifact@v4
153153
with:
154-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}
154+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}
155155
- name: Run installer
156156
run: |
157-
sudo installer -verbose -pkg ${SP_INSTALLER_NAME} -target / \
157+
sudo installer -verbose -pkg ${PKG_INSTALLER_NAME} -target / \
158158
|| ( tail -n 30 /var/log/install.log && exit 1 ) # display last log messages on error
159159
# Check the list of packages that were actually installed by the installer.
160160
- run: ./tools/export_frozen_env_def.sh
161161
- uses: actions/upload-artifact@v4
162162
with:
163-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}-json
163+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}-json
164164
path: ${{ env.PROJECT_NAME }}-*.env.json
165165
# upload just one for each installer version
166166
if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
@@ -189,12 +189,12 @@ jobs:
189189
- run: ./tools/extract_version.sh
190190
- uses: actions/download-artifact@v4
191191
with:
192-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}
193-
- run: sh ./${SP_INSTALLER_NAME} -b
192+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}
193+
- run: sh ./${PKG_INSTALLER_NAME} -b
194194
- run: ./tools/export_frozen_env_def.sh
195195
- uses: actions/upload-artifact@v4
196196
with:
197-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}-json
197+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}-json
198198
path: ${{ env.PROJECT_NAME }}-*.env.json
199199
# upload just one for each installer version
200200
if: matrix.os == 'ubuntu-24.04'
@@ -221,15 +221,15 @@ jobs:
221221
- run: ./tools/extract_version.sh
222222
- uses: actions/download-artifact@v4
223223
with:
224-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}
224+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}
225225
# https://docs.anaconda.com/anaconda/install/silent-mode.html#windows
226-
- run: .\%SP_INSTALLER_NAME% /S /InstallationType=JustMe /AddToPath=1
226+
- run: .\%PKG_INSTALLER_NAME% /S /InstallationType=JustMe /AddToPath=1
227227
timeout-minutes: 30
228228
shell: cmd
229229
- run: ./tools/export_frozen_env_def.sh
230230
- uses: actions/upload-artifact@v4
231231
with:
232-
name: ${{ env.SP_INSTALLER_ARTIFACT_ID }}-json
232+
name: ${{ env.PKG_INSTALLER_ARTIFACT_ID }}-json
233233
path: ${{ env.PROJECT_NAME}}-*.env.json
234234
# upload just one for each installer version
235235
if: matrix.os == 'windows-2022'
@@ -250,10 +250,10 @@ jobs:
250250
run:
251251
shell: bash -el {0}
252252
steps:
253-
# These names should correspond to SP_INSTALLER_ARTIFACT_ID in tools/extract_version.sh
253+
# These names should correspond to PKG_INSTALLER_ARTIFACT_ID in tools/extract_version.sh
254254
- uses: actions/download-artifact@v4
255255
with:
256-
pattern: ${{ env.PROJECT_NAME }}-Python-*
256+
pattern: ${{ env.PROJECT_NAME }}-*
257257
merge-multiple: true
258258
- run: ls -al ./
259259
- uses: ncipollo/release-action@v1

assets/post_install_macOS.sh

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#!/bin/bash
22

33
# This script must be marked +x to work correctly with the installer!
4+
#
5+
# Available variables are those exported in:
6+
# https://github.com/conda/constructor/blob/main/constructor/header.sh
47

58
set -eo pipefail
69

7-
logger -p 'install.info' "ℹ️ Running the custom Scientific Python post-install script."
10+
logger -p 'install.info' "ℹ️ Running the custom ${INSTALLER_NAME} post-install script."
811

912
# This doesn't appear to be working: even when the installer is run through
1013
# sudo, SUDO_USER is unset. Leave it here for reference:
@@ -14,11 +17,11 @@ logger -p 'install.info' "ℹ️ Running the custom Scientific Python post-insta
1417
# ☠️ This is ugly and bound to break, but seems to do the job for now. ☠️
1518
# Don't name the variable USER, as this one is already set.
1619
USER_FROM_HOMEDIR=`basename $HOME`
17-
SPI_VERSION=`basename "$(dirname $PREFIX)"`
20+
PKG_VERSION=`basename "$(dirname $PREFIX)"`
1821
logger -p 'install.info' "📓 USER_FROM_HOMEDIR=$USER_FROM_HOMEDIR"
1922
logger -p 'install.info' "📓 DSTROOT=$DSTROOT"
2023
logger -p 'install.info' "📓 PREFIX=$PREFIX"
21-
logger -p 'install.info' "📓 SPI_VERSION=$SPI_VERSION"
24+
logger -p 'install.info' "📓 PKG_VERSION=$PKG_VERSION"
2225

2326
# Guess whether it's a system-wide or only-me install
2427
if [[ "$PREFIX" == "/Applications/"* ]]; then
@@ -28,22 +31,23 @@ else
2831
APP_DIR="$HOME"/Applications
2932
PERMS=""
3033
fi
31-
SPI_APP_DIR="${APP_DIR}/Scientific-Python"
32-
logger -p 'install.info' "📓 SPI_APP_DIR=$SPI_APP_DIR"
34+
PKG_APP_DIR="${APP_DIR}/${INSTALLER_NAME}"
35+
logger -p 'install.info' "📓 PKG_APP_DIR=$PKG_APP_DIR"
3336

34-
logger -p 'install.info' "ℹ️ Moving root SP .app bundles from $APP_DIR to $SPI_APP_DIR."
35-
$PERMS mv "$APP_DIR"/Scientific\ Python\ *.app "$SPI_APP_DIR"/
37+
logger -p 'install.info' "ℹ️ Moving root project .app bundles from $APP_DIR to $PKG_APP_DIR."
38+
# Set this to match the names generated from the menu package.
39+
$PERMS mv "${APP_DIR}"/Scientific\ Python\ *.app "$PKG_APP_DIR"/
3640

37-
logger -p 'install.info' "ℹ️ Fixing permissions of SP .app bundles in $SPI_APP_DIR: new owner will be ${USER_FROM_HOMEDIR}."
38-
$PERMS chown -R "$USER_FROM_HOMEDIR" "$SPI_APP_DIR"
41+
logger -p 'install.info' "ℹ️ Fixing permissions of project .app bundles in $PKG_APP_DIR: new owner will be ${USER_FROM_HOMEDIR}."
42+
$PERMS chown -R "$USER_FROM_HOMEDIR" "$PKG_APP_DIR"
3943

40-
SPI_ICON_PATH="${PREFIX}/Menu/spi_mac_folder_icon.png"
41-
logger -p 'install.info' "ℹ️ Setting custom folder icon for $SPI_APP_DIR and $SPI_APP_DIR_ROOT to $SPI_ICON_PATH."
42-
for destPath in "$SPI_APP_DIR" "$SPI_APP_DIR_ROOT"; do
43-
logger -p 'install.info' "ℹ️ Setting custom folder icon for $destPath to $SPI_ICON_PATH."
44+
PKG_ICON_PATH="${PREFIX}/Menu/spi_mac_folder_icon.png"
45+
logger -p 'install.info' "ℹ️ Setting custom folder icon for $PKG_APP_DIR and $PKG_APP_DIR_ROOT to $PKG_ICON_PATH."
46+
for destPath in "$PKG_APP_DIR" "$PKG_APP_DIR_ROOT"; do
47+
logger -p 'install.info' "ℹ️ Setting custom folder icon for $destPath to $PKG_ICON_PATH."
4448
osascript \
4549
-e 'set destPath to "'"${destPath}"'"' \
46-
-e 'set iconPath to "'"${SPI_ICON_PATH}"'"' \
50+
-e 'set iconPath to "'"${PKG_ICON_PATH}"'"' \
4751
-e 'use framework "Foundation"' \
4852
-e 'use framework "AppKit"' \
4953
-e "set imageData to (current application's NSImage's alloc()'s initWithContentsOfFile:iconPath)" \
@@ -76,5 +80,5 @@ chown -R "$USER_FROM_HOMEDIR" "${PREFIX}"
7680
logger -p 'install.info' "ℹ️ Running spi_sys_info."
7781
${DSTBIN}/conda run -p ${PREFIX} ${PREFIX}/Menu/spi_sys_info.py nohtml || true
7882

79-
logger -p 'install.info' "ℹ️ Opening in Finder ${SPI_APP_DIR}/."
80-
open -R "${SPI_APP_DIR}/"
83+
logger -p 'install.info' "ℹ️ Opening in Finder ${PKG_APP_DIR}/."
84+
open -R "${PKG_APP_DIR}/"

recipes/scientific-python/construct.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ specs:
101101
- defusedxml =0.7.1 # https://github.com/tiran/defusedxml
102102
# Development
103103
- cython =3.1.1
104-
- pytest =8.3.5
104+
- pytest =8.4.0
105105
- pytest-timeout =2.4.0
106106
- pre-commit =4.2.0
107107
- ruff =0.11.12

tools/build_local.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null &&
44
source ${SCRIPT_DIR}/extract_version.sh
55
echo "Building installer locally"
66
echo "--------------------------"
7-
echo "Version: ${SP_INSTALLER_VERSION}"
7+
echo "Version: ${PKG_INSTALLER_VERSION}"
88
echo "Recipe: ${RECIPE_DIR}"
99
echo "OS: ${MACHINE}"
1010
echo "Machine: ${PYMACHINE}"

tools/calculate_installer_hash.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ matches=(${PROJECT_NAME}-*-*.*)
88
echo "Extracting fname"
99
installer_fname="${matches[0]}"
1010
echo "Found name: ${installer_fname}"
11-
echo "Want name: ${SP_INSTALLER_NAME}"
12-
test "$installer_fname" == "$SP_INSTALLER_NAME"
13-
hash_fname="${SP_INSTALLER_NAME}.sha256.txt"
14-
shasum -a 256 "$SP_INSTALLER_NAME" > "$hash_fname"
11+
echo "Want name: ${PKG_INSTALLER_NAME}"
12+
test "$installer_fname" == "$PKG_INSTALLER_NAME"
13+
hash_fname="${PKG_INSTALLER_NAME}.sha256.txt"
14+
shasum -a 256 "$PKG_INSTALLER_NAME" > "$hash_fname"
1515
cat "$hash_fname"

tools/check_installation.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#grouping-log-lines
44

55
set -eo pipefail
6-
echo "Running tests for SP_MACHINE=${SP_MACHINE}"
7-
source "${SP_ACTIVATE}"
6+
echo "Running tests for PKG_MACHINE=${PKG_MACHINE}"
7+
source "${PKG_ACTIVATE}"
88

99
echo "::group::conda info"
1010
conda info
@@ -19,10 +19,10 @@ pip list
1919
echo "::endgroup::"
2020

2121
echo "::group::Platform specific tests"
22-
if [[ "$SP_MACHINE" == "macOS" ]]; then
22+
if [[ "$PKG_MACHINE" == "macOS" ]]; then
2323
echo "Testing that file permissions are set correctly (owned by "$USER", not "root".)"
2424
# https://unix.stackexchange.com/a/7733
25-
APP_DIR=$(dirname $SP_INSTALL_PREFIX)
25+
APP_DIR=$(dirname $PKG_INSTALL_PREFIX)
2626
[ `ls -ld ${APP_DIR} | awk 'NR==1 {print $3}'` == "$USER" ] || exit 1
2727

2828
echo "Checking that the installed Python is a binary for the correct CPU architecture"
@@ -37,10 +37,10 @@ if [[ "$SP_MACHINE" == "macOS" ]]; then
3737
ls -al $(APP_DIR)
3838
echo "Checking that there are 5 directories"
3939
test `ls -d ${APP_DIR}/*.app | wc -l` -eq 5 || exit 1
40-
echo "Checking that the custom icon was set on the SP folder in ${APP_DIR}"
40+
echo "Checking that the custom icon was set on the project folder in ${APP_DIR}"
4141
test -f ${APP_DIR}/Icon$'\r' || exit 1
42-
export SKIP_SP_KIT_GUI_TESTS=1
43-
elif [[ "$SP_MACHINE" == "Linux" ]]; then
42+
export SKIP_PKG_KIT_GUI_TESTS=1
43+
elif [[ "$PKG_MACHINE" == "Linux" ]]; then
4444
echo "Checking that menu shortcuts were created …"
4545
pushd ~/.local/share/applications
4646
ls -l || exit 1
@@ -66,8 +66,8 @@ fi
6666
echo "::endgroup::"
6767

6868
echo "::group::Checking for pinned file..."
69-
test -e "$SP_INSTALL_PREFIX/conda-meta/pinned"
70-
grep "openblas" "$SP_INSTALL_PREFIX/conda-meta/pinned"
69+
test -e "$PKG_INSTALL_PREFIX/conda-meta/pinned"
70+
grep "openblas" "$PKG_INSTALL_PREFIX/conda-meta/pinned"
7171
echo "::endgroup::"
7272

7373
echo "::group::Checking permissions"
@@ -78,18 +78,18 @@ echo "::endgroup::"
7878

7979
echo "::group::Checking the deployed environment variables were set correctly upon environment activation"
8080
conda env config vars list
81-
if [[ "$SP_MACHINE" == "macOS" && "$MACOS_ARCH" == "Intel" ]]; then
81+
if [[ "$PKG_MACHINE" == "macOS" && "$MACOS_ARCH" == "Intel" ]]; then
8282
python -c "import os; x = os.getenv('CONDA_SUBDIR'); assert x == 'osx-64', f'CONDA_SUBDIR ({repr(x)}) != osx-64'" || exit 1
8383
fi
8484
# TODO: broken on Windows!
85-
if [[ "$SP_MACHINE" != "Windows" ]]; then
85+
if [[ "$PKG_MACHINE" != "Windows" ]]; then
8686
python -c "import os; x = os.getenv('PYTHONNOUSERSITE'); assert x == '1', f'PYTHONNOUSERSITE ({repr(x)}) != 1'" || exit 1
8787
python -c "import os; x = os.getenv('MAMBA_NO_BANNER'); assert x == '1', f'MAMBA_NO_BANNER ({repr(x)}) != 1'" || exit 1
8888
fi
8989
echo "::endgroup::"
9090

9191
echo "::group::spi_sys_info"
92-
python -u ${SP_INSTALL_PREFIX}/Menu/spi_sys_info.py nohtml
92+
python -u ${PKG_INSTALL_PREFIX}/Menu/spi_sys_info.py nohtml
9393
echo "::endgroup::"
9494

9595
echo "::group::Trying to import SP and all additional packages included in the installer"

tools/export_frozen_env_def.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
set -eo pipefail
44

5-
source "${SP_ACTIVATE}"
6-
conda list --json > ${SP_INSTALLER_NAME}.env.json
7-
cat ${SP_INSTALLER_NAME}.env.json
5+
source "${PKG_ACTIVATE}"
6+
conda list --json > ${PKG_INSTALLER_NAME}.env.json
7+
cat ${PKG_INSTALLER_NAME}.env.json

tools/extract_version.sh

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )";
44
export CONSTRUCT_YML=$(find ${SCRIPT_DIR}/../recipes -name construct.yaml)
55
export RECIPE_DIR=$(dirname $CONSTRUCT_YML)
6-
export SP_INSTALLER_VERSION=$(grep "^version: .*$" ${CONSTRUCT_YML} | cut -d' ' -f2)
6+
export PKG_INSTALLER_VERSION=$(grep "^version: .*$" ${CONSTRUCT_YML} | cut -d' ' -f2)
77
export PROJECT_NAME=$(grep "^name: .*$" ${CONSTRUCT_YML} | cut -d' ' -f2)
88
export PYSHORT=$(python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
99
UNAME="$(uname -s)"
@@ -42,53 +42,53 @@ fi
4242
export MACOS_ARCH=$MACOS_ARCH
4343

4444
if [[ "$MACHINE" == "macOS" ]]; then
45-
SP_INSTALL_PREFIX="/Applications/${PROJECT_NAME}/.scientific-python"
46-
SP_INSTALLER_NAME="${PROJECT_NAME}-${SP_INSTALLER_VERSION}-${MACHINE}_${MACOS_ARCH}.pkg"
47-
SP_ACTIVATE="$SP_INSTALL_PREFIX/bin/activate"
45+
PKG_INSTALL_PREFIX="/Applications/${PROJECT_NAME}/.scientific-python"
46+
PKG_INSTALLER_NAME="${PROJECT_NAME}-${PKG_INSTALLER_VERSION}-${MACHINE}_${MACOS_ARCH}.pkg"
47+
PKG_ACTIVATE="$PKG_INSTALL_PREFIX/bin/activate"
4848
elif [[ "$MACHINE" == "Linux" ]]; then
49-
SP_INSTALL_PREFIX="$HOME/${PROJECT_NAME}-Environment"
50-
SP_INSTALLER_NAME="${PROJECT_NAME}-${SP_INSTALLER_VERSION}-${MACHINE}.sh"
51-
SP_ACTIVATE="$SP_INSTALL_PREFIX/bin/activate"
49+
PKG_INSTALL_PREFIX="$HOME/${PROJECT_NAME}-Environment"
50+
PKG_INSTALLER_NAME="${PROJECT_NAME}-${PKG_INSTALLER_VERSION}-${MACHINE}.sh"
51+
PKG_ACTIVATE="$PKG_INSTALL_PREFIX/bin/activate"
5252
else
53-
SP_INSTALL_PREFIX="$HOME/${PROJECT_NAME}-Environment"
54-
SP_INSTALLER_NAME="${PROJECT_NAME}-${SP_INSTALLER_VERSION}-${MACHINE}.exe"
55-
SP_ACTIVATE="$SP_INSTALL_PREFIX/Scripts/activate"
53+
PKG_INSTALL_PREFIX="$HOME/${PROJECT_NAME}-Environment"
54+
PKG_INSTALLER_NAME="${PROJECT_NAME}-${PKG_INSTALLER_VERSION}-${MACHINE}.exe"
55+
PKG_ACTIVATE="$PKG_INSTALL_PREFIX/Scripts/activate"
5656
fi
5757

58-
export SP_INSTALL_PREFIX="$SP_INSTALL_PREFIX"
59-
export SP_INSTALLER_NAME="${SP_INSTALLER_NAME}"
60-
export SP_ACTIVATE="$SP_ACTIVATE"
61-
export SP_INSTALLER_ARTIFACT_ID="${PROJECT_NAME}-${MACHINE}-${ARTIFACT_ID_SUFFIX}"
62-
export SP_MACHINE="$MACHINE"
58+
export PKG_INSTALL_PREFIX="$PKG_INSTALL_PREFIX"
59+
export PKG_INSTALLER_NAME="${PKG_INSTALLER_NAME}"
60+
export PKG_ACTIVATE="$PKG_ACTIVATE"
61+
export PKG_INSTALLER_ARTIFACT_ID="${PROJECT_NAME}-${MACHINE}-${ARTIFACT_ID_SUFFIX}"
62+
export PKG_MACHINE="$MACHINE"
6363

64-
echo "Version: ${SP_INSTALLER_VERSION}"
65-
test "$SP_INSTALLER_VERSION" != ""
64+
echo "Version: ${PKG_INSTALLER_VERSION}"
65+
test "$PKG_INSTALLER_VERSION" != ""
6666
echo "System Python: ${PYSHORT}"
6767
test "$PYSHORT" != ""
6868
test -d "$SCRIPT_DIR"
6969
echo "Recipe: ${RECIPE_DIR}"
7070
test "$RECIPE_DIR" != ""
7171
test -d "$RECIPE_DIR"
72-
echo "Installer: ${SP_INSTALLER_NAME}"
73-
test "$SP_INSTALLER_NAME" != ""
74-
echo "Artifact ID: ${SP_INSTALLER_ARTIFACT_ID}"
75-
test "$SP_INSTALLER_ARTIFACT_ID" != ""
76-
echo "Prefix: ${SP_INSTALL_PREFIX}"
77-
test "$SP_INSTALL_PREFIX" != ""
78-
echo "Activate: ${SP_ACTIVATE}"
79-
test "$SP_ACTIVATE" != ""
80-
echo "Machine: ${SP_MACHINE}"
81-
test "$SP_MACHINE" != ""
72+
echo "Installer: ${PKG_INSTALLER_NAME}"
73+
test "$PKG_INSTALLER_NAME" != ""
74+
echo "Artifact ID: ${PKG_INSTALLER_ARTIFACT_ID}"
75+
test "$PKG_INSTALLER_ARTIFACT_ID" != ""
76+
echo "Prefix: ${PKG_INSTALL_PREFIX}"
77+
test "$PKG_INSTALL_PREFIX" != ""
78+
echo "Activate: ${PKG_ACTIVATE}"
79+
test "$PKG_ACTIVATE" != ""
80+
echo "Machine: ${PKG_MACHINE}"
81+
test "$PKG_MACHINE" != ""
8282

8383
if [[ "$GITHUB_ACTIONS" == "true" ]]; then
84-
echo "SP_INSTALLER_VERSION=${SP_INSTALLER_VERSION}" | tee -a $GITHUB_ENV
85-
echo "SP_INSTALLER_NAME=${SP_INSTALLER_NAME}" | tee -a $GITHUB_ENV
86-
echo "SP_INSTALLER_ARTIFACT_ID=${SP_INSTALLER_ARTIFACT_ID}" | tee -a $GITHUB_ENV
87-
echo "SP_INSTALL_PREFIX=${SP_INSTALL_PREFIX}" | tee -a $GITHUB_ENV
84+
echo "PKG_INSTALLER_VERSION=${PKG_INSTALLER_VERSION}" | tee -a $GITHUB_ENV
85+
echo "PKG_INSTALLER_NAME=${PKG_INSTALLER_NAME}" | tee -a $GITHUB_ENV
86+
echo "PKG_INSTALLER_ARTIFACT_ID=${PKG_INSTALLER_ARTIFACT_ID}" | tee -a $GITHUB_ENV
87+
echo "PKG_INSTALL_PREFIX=${PKG_INSTALL_PREFIX}" | tee -a $GITHUB_ENV
8888
echo "RECIPE_DIR=${RECIPE_DIR}" | tee -a $GITHUB_ENV
89-
echo "SP_ACTIVATE=${SP_ACTIVATE}" | tee -a $GITHUB_ENV
89+
echo "PKG_ACTIVATE=${PKG_ACTIVATE}" | tee -a $GITHUB_ENV
9090
echo "NSIS_SCRIPTS_RAISE_ERRORS=1" | tee -a $GITHUB_ENV
91-
echo "SP_MACHINE=${SP_MACHINE}" | tee -a $GITHUB_ENV
91+
echo "PKG_MACHINE=${PKG_MACHINE}" | tee -a $GITHUB_ENV
9292
echo "MACOS_ARCH=${MACOS_ARCH}" | tee -a $GITHUB_ENV
9393
if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
9494
echo "ARTIFACT_RETENTION_DAYS=5" | tee -a $GITHUB_ENV

tools/macos_check_installer_signature.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
set -eo pipefail
44

55
if [[ "$GITHUB_EVENT_NAME" != "pull_request" ]]; then
6-
pkgutil --check-signature ${SP_INSTALLER_NAME} || exit 1
6+
pkgutil --check-signature ${PKG_INSTALLER_NAME} || exit 1
77
fi
88
# Now extract the package and check that the _conda binary is
99
# properly signed as well
10-
pkgutil --expand-full ${SP_INSTALLER_NAME} ./sp-extracted
11-
DIR="./sp-extracted/prepare_installation.pkg/Payload/.scientific-python"
10+
pkgutil --expand-full ${PKG_INSTALLER_NAME} ./pkg-extracted
11+
# Get pkg_name from construct.yaml file.
12+
cons_pkg_name=$(basename $PKG_INSTALL_PREFIX)
13+
DIR="./pkg-extracted/prepare_installation.pkg/Payload/${cons_pkg_name}"
1214
echo "Checking ${DIR} exists"
1315
test -d "$DIR"
1416
ls -al "$DIR"

0 commit comments

Comments
 (0)