Skip to content

Commit 358eb7d

Browse files
authored
Merge pull request #2567 from Azure/release/prepare-2.15.0
Merge master into stable for release 2.15.0
2 parents 2423e88 + 452ef49 commit 358eb7d

File tree

17 files changed

+165
-2651
lines changed

17 files changed

+165
-2651
lines changed
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
steps:
22
- template: ../dependencies.yml
3+
- script: |
4+
set -e
5+
echo "Homebrew version $(brew --version)"
6+
brew install openssl readline sqlite3 xz zlib tcl-tk
7+
displayName: Install MacOS Python dependencies
38
- script: |
49
set -e
510
echo "Node.js version $(node --version)"
611
echo "NPM version $(npm --version)"
712
npm ci
8-
displayName: Install MacOS dependencies
13+
displayName: Install MacOS JavaScript dependencies

.vsts/distribution.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
- job: MacOS
1212
pool:
13-
vmImage: macOS-10.15
13+
vmImage: macOS-11
1414
demands: xcode
1515
variables:
1616
- name: EOCompliance-Mac

.vsts/pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
- job: MacOS
1212
pool:
13-
vmImage: macOS-10.15
13+
vmImage: macOS-11
1414
demands: xcode
1515
variables:
1616
- name: EOCompliance-Mac

.vsts/python-setup.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ steps:
22
- task: UsePythonVersion@0
33
condition: eq( variables['Agent.OS'], 'Windows_NT' )
44
inputs:
5-
versionSpec: '3.8.x'
6-
displayName: Install Python 3.8 for Batch Explorer
5+
versionSpec: '3.9'
6+
displayName: Install Python 3.9 for Batch Explorer
77

88
- bash: ./scripts/azpipelines/setup-python.sh
99
displayName: Set up Python environment and private feed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 2.15.0
2+
3+
[All items](https://github.com/Azure/BatchExplorer/milestone/49?closed=1)
4+
5+
### Bugs
6+
7+
* Users with custom permissions were not able to create pools or jobs [\#2077](https://github.com/Azure/BatchExplorer/issues/2077)
8+
19
# 2.14.2
210

311
### Bugs

ThirdPartyNotices.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4573,6 +4573,38 @@ The externally maintained libraries used by Node.js are:
45734573
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
45744574
"""
45754575

4576+
- base64, located at deps/base64/base64/, is licensed as follows:
4577+
"""
4578+
Copyright (c) 2005-2007, Nick Galbreath
4579+
Copyright (c) 2013-2019, Alfred Klomp
4580+
Copyright (c) 2015-2017, Wojciech Mula
4581+
Copyright (c) 2016-2017, Matthieu Darbois
4582+
All rights reserved.
4583+
4584+
Redistribution and use in source and binary forms, with or without
4585+
modification, are permitted provided that the following conditions are
4586+
met:
4587+
4588+
- Redistributions of source code must retain the above copyright notice,
4589+
this list of conditions and the following disclaimer.
4590+
4591+
- Redistributions in binary form must reproduce the above copyright
4592+
notice, this list of conditions and the following disclaimer in the
4593+
documentation and/or other materials provided with the distribution.
4594+
4595+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
4596+
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
4597+
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
4598+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
4599+
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
4600+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
4601+
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
4602+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
4603+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
4604+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
4605+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4606+
"""
4607+
45764608
------------------------------------------------------------
45774609
End license for node.js
45784610
============================================================

0 commit comments

Comments
 (0)