diff --git a/.azure/pipelines.yml b/.azure/pipelines.yml index 98994b88d8..2683167f7a 100644 --- a/.azure/pipelines.yml +++ b/.azure/pipelines.yml @@ -21,7 +21,7 @@ schedules: variables: system.debug: true system.log: true - use_lockfile: not(eq(variables['Build.CronSchedule.DisplayName'], 'Daily midnight build')) + # use_lockfile: not(eq(variables['Build.CronSchedule.DisplayName'], 'Daily midnight build')) stages: - stage: Analyze @@ -38,7 +38,6 @@ stages: - template: templates/install.yml parameters: conda_packages: 'hunspell' - use_lockfile: ${{ variables.use_lockfile }} - bash: | source activate myEnvironment @@ -66,7 +65,6 @@ stages: - template: templates/install.yml parameters: conda_packages: 'numpy' - use_lockfile: ${{ variables.use_lockfile }} - bash: | source activate myEnvironment @@ -89,7 +87,6 @@ stages: - template: templates/install.yml parameters: conda_packages: 'numpy' - use_lockfile: ${{ variables.use_lockfile }} - bash: | source activate myEnvironment @@ -164,7 +161,6 @@ stages: - template: templates/install.yml parameters: conda_lock: environments/locks/conda-$(FIPY_SOLVERS)-lock.yml - use_lockfile: ${{ variables.use_lockfile }} - bash: | source activate myEnvironment @@ -204,7 +200,6 @@ stages: - template: templates/install.yml parameters: conda_lock: environments/locks/conda-$(FIPY_SOLVERS)-lock.yml - use_lockfile: ${{ variables.use_lockfile }} - bash: git fetch origin --tags --force displayName: Fetch tags diff --git a/.azure/templates/install.yml b/.azure/templates/install.yml index d73da41ef5..cf6e230351 100644 --- a/.azure/templates/install.yml +++ b/.azure/templates/install.yml @@ -5,9 +5,6 @@ parameters: - name: conda_lock type: string default: environments/locks/conda-scipy-lock.yml -- name: use_lockfile - type: boolean - default: true steps: - bash: echo "##vso[task.prependpath]$CONDA/bin" @@ -41,14 +38,14 @@ steps: conda install --channel=conda-forge --name=base conda-lock conda-lock install --name myEnvironment ${{ parameters.conda_lock }} displayName: Create Anaconda environment from lockfile - condition: eq(parameters.use_lockfile, true) + condition: eq(variables['Build.CronSchedule.DisplayName'], 'Daily midnight build') - bash: | conda env create --name myEnvironment \ --file environments/environment.yml \ --file environments/$(FIPY_SOLVERS)-environment.yml displayName: Create Anaconda environment from environments - condition: eq(parameters.use_lockfile, false) + condition: not(eq(variables['Build.CronSchedule.DisplayName'], 'Daily midnight build')) - bash: | if [[ "${{ parameters.conda_packages }}" != "" ]]; then