Skip to content

Commit cbe1395

Browse files
committed
Use conda-standalone instead of micromamba on osx-arm64 to enable shortcut creation
1 parent 63b83db commit cbe1395

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ jobs:
114114
TARGET_PLATFORM: osx-arm64
115115
env:
116116
DISPLAY: ':0'
117-
MICROMAMBA_VERSION: '2.0.5'
118117

119118
defaults:
120119
run:
@@ -128,39 +127,22 @@ jobs:
128127
channels: conda-forge
129128
channel-priority: strict
130129

131-
- name: Conda info
132-
run: |
133-
conda info
134-
conda list
135-
136130
- name: Install constructor
137131
run: |
138132
conda install constructor
139133
140-
- name: Install micromamba
141-
if: matrix.ARCH == 'arm64'
134+
- name: Conda info
142135
run: |
143-
TEMP_DIR=$(mktemp -d)
144-
mkdir "${TEMP_DIR}/micromamba"
145-
pushd "${TEMP_DIR}/micromamba"
146-
curl -L -O "https://anaconda.org/conda-forge/micromamba/${{ env.MICROMAMBA_VERSION }}/download/${{ matrix.TARGET_PLATFORM }}/micromamba-${{ env.MICROMAMBA_VERSION }}-0.tar.bz2"
147-
bsdtar -xf "micromamba-${{ env.MICROMAMBA_VERSION }}-0.tar.bz2"
148-
echo "MICROMAMBA_FILE=${PWD}/bin/micromamba" >> $GITHUB_ENV
149-
ls ${PWD}
150-
ls ${PWD}/bin
151-
popd
136+
conda info
137+
conda list
152138
153139
- name: Build distribution
154140
env:
155141
VERSION: ${{ needs.create_release_job.outputs.VERSION }}
156142
BLAS_IMPL: ${{ matrix.BLAS_IMPL }}
157143
CONDA_SOLVER: 'libmamba'
158144
run: |
159-
if [ ${{ matrix.TARGET_PLATFORM }} == osx-arm64 ]; then
160-
constructor -v conda_distribution --platform ${{ matrix.TARGET_PLATFORM }} --conda-exe ${{ env.MICROMAMBA_FILE }}
161-
else
162-
constructor -v conda_distribution
163-
fi
145+
constructor -v conda_distribution
164146
165147
- name: Set asset name
166148
env:
@@ -197,7 +179,7 @@ jobs:
197179
- name: Install new distribution (MacOS)
198180
if: runner.os == 'macos'
199181
run: |
200-
echo "install_dir=/Users/runner" >> $GITHUB_ENV
182+
echo "install_dir=/Users/runner/hyperspy-bundle" >> $GITHUB_ENV
201183
installer -pkg ${{ env.asset_name }} -target CurrentUserHomeDirectory
202184
203185
- name: Install new distribution (Windows)
@@ -220,6 +202,10 @@ jobs:
220202
path: ${{ env.asset_name }}
221203
name: ${{ env.asset_name }}
222204

205+
- name: Show install folder content
206+
run : |
207+
ls "${{ env.install_dir }}"
208+
223209
- name: Info new distribution
224210
run: |
225211
conda activate "${{ env.install_dir }}"

0 commit comments

Comments
 (0)