Skip to content

Commit 3256576

Browse files
[Trigger] Update from main (#820)
* update java library 0.1.1 -> 1.0.0 (#804) * Pin Node version to 18.15 (#818) * Pin Node version to 18.15 * Update build pipeline * Set node modules path for all * Debug * Pass in env var * Update pipeline comments (#819) --------- Co-authored-by: Lucy Zhang <luczhan@microsoft.com>
1 parent 683d421 commit 3256576

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

builds/azure-pipelines/template-steps-build-test.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,22 @@ steps:
2727
result: PoliCheck.xml
2828
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
2929

30+
# Use 18.15 directly due to https://github.com/Azure/azure-functions-core-tools/issues/3335
31+
- task: NodeTool@0
32+
inputs:
33+
versionSpec: '18.15'
34+
3035
- script: npm install -g azure-functions-core-tools
3136
displayName: 'Install Azure Functions Core Tools'
3237

3338
- script: npm install -g azurite
3439
displayName: 'Install Azurite Local Storage Emulator'
3540

3641
# This step is necessary because npm installs to a non-traditional location on Windows hosted agents
42+
# For non-Windows agents we still want to ensure that we always get the correct location where the tools are installed
3743
# This sets the path to npm global installations as a variable which then gets passed to .NET test task
3844
- bash: echo "##vso[task.setvariable variable=nodeModulesPath]$(npm root -g)"
39-
displayName: 'Set npm installation path for Windows'
40-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
45+
displayName: 'Set npm installation path'
4146

4247
- bash: echo "##vso[task.setvariable variable=azureFunctionsExtensionBundlePath]$(func GetExtensionBundlePath)"
4348
displayName: 'Set Azure Functions extension bundle path'
@@ -205,6 +210,7 @@ steps:
205210
displayName: '.NET Test on Linux (both unit and integration tests)'
206211
env:
207212
SA_PASSWORD: '$(serverPassword)'
213+
NODE_MODULES_PATH: '$(nodeModulesPath)'
208214
AZUREFUNCTIONS_SQLBINDINGS_TELEMETRY_OPTOUT: '1'
209215
inputs:
210216
command: test

builds/azure-pipelines/template-steps-performance.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,22 @@ steps:
2121
inputs:
2222
useGlobalJson: true
2323

24+
# Use 18.15 directly due to https://github.com/Azure/azure-functions-core-tools/issues/3335
25+
- task: NodeTool@0
26+
inputs:
27+
versionSpec: '18.15'
28+
2429
- script: npm install -g azure-functions-core-tools
2530
displayName: 'Install Azure Functions Core Tools'
2631

2732
- script: npm install -g azurite
2833
displayName: 'Install Azurite Local Storage Emulator'
2934

3035
# This step is necessary because npm installs to a non-traditional location on Windows hosted agents
31-
# This sets the path to npm global installations as a variable which then gets passed to the .NET run task
36+
# For non-Windows agents we still want to ensure that we always get the correct location where the tools are installed
37+
# This sets the path to npm global installations as a variable which then gets passed to .NET test task
3238
- bash: echo "##vso[task.setvariable variable=nodeModulesPath]$(npm root -g)"
33-
displayName: 'Set npm installation path for Windows'
34-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
39+
displayName: 'Set npm installation path'
3540

3641
- task: DockerInstaller@0
3742
displayName: Docker Installer

docs/SetupGuide_Java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ These instructions will guide you through creating your Function Project and add
5252
<dependency>
5353
<groupId>com.microsoft.azure.functions</groupId>
5454
<artifactId>azure-functions-java-library-sql</artifactId>
55-
<version>[0.1.1,)</version>
55+
<version>[1.0.0,)</version>
5656
</dependency>
5757
```
5858

0 commit comments

Comments
 (0)