Skip to content

Commit 9d75557

Browse files
authored
[CI] fix nightly conda deployment (#2515)
1 parent 9e8ddf2 commit 9d75557

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

.github/workflows/install_and_test.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -311,21 +311,21 @@ jobs:
311311
path: "./habitat-sim"
312312
- name: Set CI_TEST variable based on "main merge" vs. "pull_request" workflow
313313
run: |-
314-
echo "NIGHTLY=''" >> $GITHUB_ENV
315-
echo "CI_TEST='true'" >> $GITHUB_ENV
314+
echo "NIGHTLY=" >> $GITHUB_ENV
315+
echo "CI_TEST=true" >> $GITHUB_ENV
316316
if [[ ${{ github.event_name }} == 'push' ]]; then
317317
if [[ ${GITHUB_REF} == refs/heads/* ]]; then
318318
echo "trigger: a push to main branch"
319319
elif [[ ${GITHUB_REF} == refs/tags/* ]]; then
320320
echo "trigger: a version tag push"
321-
echo "CI_TEST='false'" >> $GITHUB_ENV
321+
echo "CI_TEST=false" >> $GITHUB_ENV
322322
echo "CONDA_USERNAME=$AIHABITAT_CONDA_USERNAME" >> $GITHUB_ENV
323323
echo "CONDA_PWD=$AIHABITAT_CONDA_PWD" >> $GITHUB_ENV
324324
fi
325325
elif [[ ${{ github.event_name }} == 'schedule' ]]; then
326326
echo "trigger: a nightly build"
327-
echo "CI_TEST='false'" >> $GITHUB_ENV
328-
echo "NIGHTLY='--nightly'" >> $GITHUB_ENV
327+
echo "CI_TEST=false" >> $GITHUB_ENV
328+
echo "NIGHTLY=--nightly" >> $GITHUB_ENV
329329
echo "CONDA_USERNAME=$AIHABITAT_NIGHTLY_CONDA_USERNAME" >> $GITHUB_ENV
330330
echo "CONDA_PWD=$AIHABITAT_NIGHTLY_CONDA_PWD" >> $GITHUB_ENV
331331
elif [[ ${{ github.event_name }} == 'pull_request' ]]; then
@@ -339,7 +339,7 @@ jobs:
339339
echo ${{ env.NIGHTLY }}
340340
341341
#pivot on the build type
342-
if [[ ${{ env.CI_TEST }} ]]; then
342+
if [[ ${{ env.CI_TEST }} == true ]]; then
343343
echo "This is a CI test."
344344
else
345345
echo "This is a full conda build with deployment."
@@ -348,9 +348,9 @@ jobs:
348348
bash Anaconda3-2020.11-Linux-x86_64.sh -b -p $HOME/anaconda
349349
export PATH=$HOME/anaconda/bin:$PATH
350350
351-
# Delete old nightly builds
352-
#NOTE: The ${{ env.NIGHTLY }} == "--nightly" variable is necessary to trigger this
353-
#python common/delete_old_night_packages.py --username ${{ env.CONDA_USERNAME }} --password ${{ env.CONDA_PWD }} ${{ env.NIGHTLY }}
351+
echo "Delete old nightly builds"
352+
python common/delete_old_night_packages.py --username ${{ env.CONDA_USERNAME }} --password ${{ env.CONDA_PWD }} ${{ env.NIGHTLY }}
353+
354354
fi
355355
356356
#install Docker
@@ -361,12 +361,15 @@ jobs:
361361
sudo apt-get install -y docker-ce
362362
363363
#build the container
364+
echo "Building the docker container"
364365
docker build -t hsim_condabuild_dcontainer -f Dockerfile .
365366
366-
if [[ ${{ env.CI_TEST }} ]]; then
367+
if [[ ${{ env.CI_TEST }} == true ]]; then
368+
echo "Running matrix_builder for CI test."
367369
docker run --ipc=host --rm -v $(pwd)/../../:/remote hsim_condabuild_dcontainer /bin/bash -c "source ~/.bashrc && conda activate py39 && cd /remote/habitat-sim/ && git config --global --add safe.directory '*' && cd /remote/habitat-sim/conda-build && python matrix_builder.py --ci_test"
368370
else
369-
docker run --ipc=host --rm -v $(pwd)/../../:/remote --env ${{ env.CONDA_PWD }} hsim_condabuild_dcontainer /bin/bash -c "source ~/.bashrc && conda activate py39 && cd /remote/habitat-sim/ && git config --global --add safe.directory '*' && cd /remote/habitat-sim/conda-build && yes | anaconda login --username ${{ env.CONDA_USERNAME }} --password ${{ env.CONDA_PWD }} --hostname "aihabitat-conda-ci-builder-linux" && python matrix_builder.py --conda_upload ${{ env.NIGHTLY }}"
371+
echo "Running matrix_builder for deployment."
372+
docker run --ipc=host --rm -v $(pwd)/../../:/remote --env ${{ env.CONDA_PWD }} hsim_condabuild_dcontainer /bin/bash -c "source ~/.bashrc && conda activate py39 && cd /remote/habitat-sim/ && git config --global --add safe.directory '*' && cd /remote/habitat-sim/conda-build && yes | anaconda login --username ${{ env.CONDA_USERNAME }} --password ${{ env.CONDA_PWD }} --hostname aihabitat-conda-ci-builder-linux && python matrix_builder.py --conda_upload ${{ env.NIGHTLY }}"
370373
fi
371374
372375
build_conda_osx:
@@ -391,21 +394,21 @@ jobs:
391394
activate-environment: "habitat"
392395
- name: Set CI_TEST variable based on "main merge" vs. "pull_request" workflow
393396
run: |-
394-
echo "NIGHTLY=''" >> $GITHUB_ENV
395-
echo "CI_TEST='true'" >> $GITHUB_ENV
397+
echo "NIGHTLY=" >> $GITHUB_ENV
398+
echo "CI_TEST=true" >> $GITHUB_ENV
396399
echo "CONDA_USERNAME=$AIHABITAT_CONDA_USERNAME" >> $GITHUB_ENV
397400
echo "CONDA_PWD=$AIHABITAT_CONDA_PWD" >> $GITHUB_ENV
398401
if [[ ${{ github.event_name }} == 'push' ]]; then
399402
if [[ ${GITHUB_REF} == refs/heads/* ]]; then
400403
echo "trigger: a push to main branch"
401404
elif [[ ${GITHUB_REF} == refs/tags/* ]]; then
402405
echo "trigger: a version tag push"
403-
echo "CI_TEST='false'" >> $GITHUB_ENV
406+
echo "CI_TEST=false" >> $GITHUB_ENV
404407
fi
405408
elif [[ ${{ github.event_name }} == 'schedule' ]]; then
406409
echo "trigger: a nightly build"
407-
echo "CI_TEST='false'" >> $GITHUB_ENV
408-
echo "NIGHTLY='--nightly'" >> $GITHUB_ENV
410+
echo "CI_TEST=false" >> $GITHUB_ENV
411+
echo "NIGHTLY=--nightly" >> $GITHUB_ENV
409412
echo "CONDA_USERNAME=$AIHABITAT_NIGHTLY_CONDA_USERNAME" >> $GITHUB_ENV
410413
echo "CONDA_PWD=$AIHABITAT_NIGHTLY_CONDA_PWD" >> $GITHUB_ENV
411414
elif [[ ${{ github.event_name }} == 'pull_request' ]]; then
@@ -426,7 +429,7 @@ jobs:
426429
rm -rf build
427430
(yes || true) | anaconda login --username ${{ env.CONDA_USERNAME }} --password ${{ env.CONDA_PWD }} --hostname "aihabitat-conda-ci-builder-macos"
428431
#pivot on the build type
429-
if [[ ${{ env.CI_TEST }} ]]; then
432+
if [[ ${{ env.CI_TEST }} == true ]]; then
430433
echo "This is a CI test."
431434
cd conda-build
432435
export PYTHONIOENCODING="utf-8"

0 commit comments

Comments
 (0)