diff --git a/azure-pipelines/run-ci-builds.yml b/azure-pipelines/run-ci-builds.yml index d7ae36b..bf1ca43 100644 --- a/azure-pipelines/run-ci-builds.yml +++ b/azure-pipelines/run-ci-builds.yml @@ -13,6 +13,7 @@ jobs: pool: name: Azure Pipelines vmImage: 'ubuntu-latest' + timeoutInMinutes: 180 steps: - checkout: self diff --git a/builders/nix-python-builder.psm1 b/builders/nix-python-builder.psm1 index ceb0cb3..f486697 100644 --- a/builders/nix-python-builder.psm1 +++ b/builders/nix-python-builder.psm1 @@ -93,7 +93,14 @@ class NixPythonBuilder : PythonBuilder { $installationTemplateLocation = Join-Path -Path $this.InstallationTemplatesLocation -ChildPath $this.InstallationTemplateName $installationTemplateContent = Get-Content -Path $installationTemplateLocation -Raw - $installationTemplateContent = $installationTemplateContent -f $this.Version.Major, $this.Version.Minor, $this.Version.Build + + $variablesToReplace = @{ + "{{__VERSION_MAJOR__}}" = $this.Version.Major; + "{{__VERSION_MINOR__}}" = $this.Version.Minor; + "{{__VERSION_BUILD__}}" = $this.Version.Build; + } + $variablesToReplace.keys | ForEach-Object { $installationTemplateContent = $installationTemplateContent.Replace($_, $variablesToReplace[$_]) } + $installationTemplateContent | Out-File -FilePath $installationScriptLocation Write-Debug "Done; Installation script location: $installationScriptLocation)" diff --git a/installers/nix-setup-template.sh b/installers/nix-setup-template.sh index dd27788..ea9a14b 100644 --- a/installers/nix-setup-template.sh +++ b/installers/nix-setup-template.sh @@ -1,8 +1,8 @@ set -e -MAJOR_VERSION={0} -MINOR_VERSION={1} -BUILD_VERSION={2} +MAJOR_VERSION="{{__VERSION_MAJOR__}}" +MINOR_VERSION="{{__VERSION_MINOR__}}" +BUILD_VERSION="{{__VERSION_BUILD__}}" PYTHON_MAJOR=python$MAJOR_VERSION PYTHON_MAJOR_DOT_MINOR=python$MAJOR_VERSION.$MINOR_VERSION