Skip to content

Commit

Permalink
Merge pull request #2567 from Azure/release/prepare-2.15.0
Browse files Browse the repository at this point in the history
Merge master into stable for release 2.15.0
  • Loading branch information
gingi authored Sep 1, 2022
2 parents 2423e88 + 452ef49 commit 358eb7d
Show file tree
Hide file tree
Showing 17 changed files with 165 additions and 2,651 deletions.
7 changes: 6 additions & 1 deletion .vsts/darwin/darwin-dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
steps:
- template: ../dependencies.yml
- script: |
set -e
echo "Homebrew version $(brew --version)"
brew install openssl readline sqlite3 xz zlib tcl-tk
displayName: Install MacOS Python dependencies
- script: |
set -e
echo "Node.js version $(node --version)"
echo "NPM version $(npm --version)"
npm ci
displayName: Install MacOS dependencies
displayName: Install MacOS JavaScript dependencies
2 changes: 1 addition & 1 deletion .vsts/distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

- job: MacOS
pool:
vmImage: macOS-10.15
vmImage: macOS-11
demands: xcode
variables:
- name: EOCompliance-Mac
Expand Down
2 changes: 1 addition & 1 deletion .vsts/pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

- job: MacOS
pool:
vmImage: macOS-10.15
vmImage: macOS-11
demands: xcode
variables:
- name: EOCompliance-Mac
Expand Down
4 changes: 2 additions & 2 deletions .vsts/python-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ steps:
- task: UsePythonVersion@0
condition: eq( variables['Agent.OS'], 'Windows_NT' )
inputs:
versionSpec: '3.8.x'
displayName: Install Python 3.8 for Batch Explorer
versionSpec: '3.9'
displayName: Install Python 3.9 for Batch Explorer

- bash: ./scripts/azpipelines/setup-python.sh
displayName: Set up Python environment and private feed
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 2.15.0

[All items](https://github.com/Azure/BatchExplorer/milestone/49?closed=1)

### Bugs

* Users with custom permissions were not able to create pools or jobs [\#2077](https://github.com/Azure/BatchExplorer/issues/2077)

# 2.14.2

### Bugs
Expand Down
32 changes: 32 additions & 0 deletions ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4573,6 +4573,38 @@ The externally maintained libraries used by Node.js are:
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""

- base64, located at deps/base64/base64/, is licensed as follows:
"""
Copyright (c) 2005-2007, Nick Galbreath
Copyright (c) 2013-2019, Alfred Klomp
Copyright (c) 2015-2017, Wojciech Mula
Copyright (c) 2016-2017, Matthieu Darbois
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

- Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""

------------------------------------------------------------
End license for node.js
============================================================
Expand Down
Loading

0 comments on commit 358eb7d

Please sign in to comment.