diff --git a/.github/workflows/quicktest.yaml b/.github/workflows/quicktest.yaml index 3e8ebb69..e37bb968 100644 --- a/.github/workflows/quicktest.yaml +++ b/.github/workflows/quicktest.yaml @@ -61,21 +61,21 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - echo "::group::Debug information" - echo "Workflow: ${{ github.workflow }}" - echo "Action: ${{ github.event.action }}" - if [[ "${{ github.event_name }}" == "pull_request" ]] - echo "PR: ${{ github.event.number }}" - echo "Event Triggered by: ${{ github.event.sender.login }}" - elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]] - echo "Inputs" - cat < /dev/null <> $GITHUB_OUTPUT elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]] then - # the inputs context is only useful/set in the workflow dispatch event case - if [[ "${{ toJSON(inputs) }}" == "{}" ]] || [[ "${{ inputs.docker-image }}" == "" ]] ; then + # the inputs context is only useful/set in the workflow dispatch event case + if [[ "${{ inputs.docker-image }}" == "" ]] ; then echo "DOCKER_IMAGE=build-cached" > $GITHUB_OUTPUT else echo "DOCKER_IMAGE=${{ inputs.docker-image }}" > $GITHUB_OUTPUT @@ -105,7 +105,7 @@ jobs: echo "This workflow is not defined for the event ${{ github.event_name }}!" exit 1 fi - if ! gh api -H "$h1" -H "$h2" /repos/${{ github.repository }}/collaborators/${{ github.event.sender.login }} + if ! gh api "${gh_header[@]}" /repos/${{ github.repository }}/collaborators/${{ github.event.sender.login }} then echo "Only collaborators explicitly listed as collaborators can trigger this workflow!" echo "CONTINUE=false" >> $GITHUB_OUTPUT diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 4487508c..60a04785 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -94,7 +94,7 @@ COPY ./env/fastsurfer.yml ./Docker/conda_pack.sh ./Docker/install_env.py /instal ARG DEBUG=false RUN python /install/install_env.py -m base -i /install/fastsurfer.yml \ -o /install/base-env.yml && \ - mamba env create -f "/install/base-env.yml" | tee /install/env-create.log ; \ + mamba env create -qy -f "/install/base-env.yml" | tee /install/env-create.log ; \ if [ "${DEBUG}" != "true" ]; then \ rm /install/base-env.yml ; \ fi @@ -106,12 +106,12 @@ ARG DEVICE=cu118 # install additional packages for cuda/rocm/cpu RUN python /install/install_env.py -m ${DEVICE} -i /install/fastsurfer.yml \ -o /install/${DEVICE}-env.yml && \ - mamba env update -n "fastsurfer" -f "/install/${DEVICE}-env.yml" \ + mamba env update -q -n "fastsurfer" -f "/install/${DEVICE}-env.yml" \ | tee /install/env-update.log && \ /install/conda_pack.sh "fastsurfer" && \ echo "DEBUG=$DEBUG\nDEVICE=$DEVICE\n" > /install/build_conda.args ; \ if [ "${DEBUG}" != "true" ]; then \ - mamba env remove -n "fastsurfer" && \ + mamba env remove -qy -n "fastsurfer" && \ rm -R /install ; \ fi