Release 3.1.1.1

Attemps to fix partially failing CI
SURGroup · Mar 22, 2021 · 8e99c9f · 8e99c9f
2 parents 64313aa + 311168e
commit 8e99c9f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/README.rst b/README.rst
@@ -7,7 +7,8 @@
 .. |LatestRelease| image:: https://img.shields.io/github/downloads/SURGroup/UQpy/latest/total?style=plastic   :alt: GitHub Releases (by Release)
 .. |Binder| image:: https://mybinder.org/badge_logo.svg
  :target: https://mybinder.org/v2/gh/SURGroup/UQpy/master
-.. |AzurePipelines| image:: https://img.shields.io/azure-devops/build/UQpy/UQpy/1   :alt: Azure DevOps builds
+
+.. |AzurePipelines| image:: https://img.shields.io/azure-devops/build/UQpy/5ce1851f-e51f-4e18-9eca-91c3ad9f9900/1/master   :alt: Azure DevOps builds (branch)
 
 
 *******************************************

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,12 +7,7 @@
 variables:
   pythonVersion: 3.7
   srcDirectory: src
-  MajorVersion: 1
-  MinorVersion: 0
-  InitialReleaseTagNumber: 1
-  IncrementReleaseTagNumber: $[counter(variables['InitialReleaseTagNumber'], 0)]
-  shouldRunSonarcloud: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'),eq(variables['Build.SourceBranch'], 'refs/heads/Development'),eq(variables['Build.Reason'], 'PullRequest'))]
-
+
 trigger:
   - master
   - Development
@@ -25,7 +20,6 @@ pr:
     include:
     - master
     - Development
-    - feature/Restructuring
 
 pool:
   vmImage: "macOS-latest"
@@ -55,7 +49,7 @@ steps:
     # condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
   - task: SonarCloudPrepare@1
-    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/master'),eq(variables['Build.SourceBranch'], 'refs/heads/Development'),eq(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/feature/Restructuring'))
+    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/master'),eq(variables['Build.SourceBranch'], 'refs/heads/Development'),eq(variables['Build.Reason'], 'PullRequest'))
     inputs:
       SonarCloud: 'SonarCloud.UQpy'
       organization: 'jhusurg'
@@ -97,10 +91,10 @@ steps:
       additionalCodeCoverageFiles: '$(System.DefaultWorkingDirectory)/ **'
 
   - task: SonarCloudAnalyze@1
-    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/master'),eq(variables['Build.SourceBranch'], 'refs/heads/Development'),eq(variables['Build.Reason'], 'PullRequest'),eq(variables['Build.SourceBranch'], 'refs/heads/feature/Restructuring'))
+    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/master'),eq(variables['Build.SourceBranch'], 'refs/heads/Development'),eq(variables['Build.Reason'], 'PullRequest'))
 
   - task: SonarCloudPublish@1
-    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/master'),eq(variables['Build.SourceBranch'], 'refs/heads/Development'),eq(variables['Build.Reason'], 'PullRequest'),eq(variables['Build.SourceBranch'], 'refs/heads/feature/Restructuring'))
+    condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/master'),eq(variables['Build.SourceBranch'], 'refs/heads/Development'),eq(variables['Build.Reason'], 'PullRequest'))
     inputs:
       pollingTimeoutSec: '300'
 
@@ -124,8 +118,8 @@ steps:
       publishLocation: 'Container'
 
   - script: |
-      twine upload --repository-url https://test.pypi.org/legacy/ dist/* --username "$(TESTPYPIU)" --password "$(TESTPYPIP)"
-    displayName: Upload to Test PyPi
+      twine upload --repository-url https://upload.pypi.org/legacy/ dist/* --username "$(TESTPYPIU)" --password "$(TESTPYPIP)"
+    displayName: Upload to PyPi
     condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
   - task: GitHubRelease@1
@@ -143,6 +137,10 @@ steps:
   - bash: echo "##vso[task.prependpath]$CONDA/bin"
     displayName: Add conda to PATH
     condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
+
+  - bash: sudo chown -R $USER $CONDA
+    displayName: Take ownership of conda installation
+    condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
 
   - bash: conda create --yes --quiet --name myEnvironment
     displayName: Create Anaconda environment
@@ -163,7 +161,7 @@ steps:
   - bash: |
       source activate myEnvironment
       anaconda login --username $(ANACONDAUSER) --password $(ANACONDAPW)
-      anaconda upload /usr/share/miniconda/envs/myEnvironment/conda-bld/noarch/*.tar.bz2
+      anaconda upload /usr/local/miniconda/envs/myEnvironment/conda-bld/noarch/*.tar.bz2
     displayName: Upload conda packages
     condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')