Skip to content

Commit bd9a7e4

Browse files
davidmrdaviddavidmrdavid
authored
Merge pull request #313 from Azure/dev
Promote dev to main for 1.5.4 relase
2 parents b37999f + 4dc9bf3 commit bd9a7e4

6 files changed

+207
-208
lines changed

‎.prettierrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"tabWidth": 4,
44
"true": false,
55
"singleQuote": false,
6-
"printWidth": 100
6+
"printWidth": 100,
7+
"endOfLine": "auto"
78
}

‎azure-pipelines-release.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
trigger: none
2+
pr: none
3+
4+
resources:
5+
pipelines:
6+
- pipeline: DurableJSCI
7+
project: "Azure Functions"
8+
source: azure-functions-durable-js
9+
branch: main
10+
11+
jobs:
12+
- job: Release
13+
pool:
14+
name: "1ES-Hosted-AzFunc"
15+
demands:
16+
- ImageOverride -equals MMSUbuntu20.04TLS
17+
steps:
18+
- task: NodeTool@0
19+
displayName: "Install Node.js"
20+
inputs:
21+
versionSpec: 14.x
22+
- download: DurableJSCI
23+
- script: mv *.tgz package.tgz
24+
displayName: "Rename tgz file" # because the publish command below requires an exact path
25+
workingDirectory: "$(Pipeline.Workspace)/DurableJSCI/drop"
26+
- task: Npm@1
27+
displayName: "npm publish"
28+
inputs:
29+
command: custom
30+
workingDir: "$(Pipeline.Workspace)/DurableJSCI/drop"
31+
verbose: true
32+
customCommand: "publish package.tgz"
33+
publishEndpoint: "NPM Durable Functions JS Publish"

‎azure-pipelines.yml

+96-39
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,101 @@
1-
variables: {
2-
MODULE_VERSION: '1.2.2',
3-
NODE_8: '8.x',
4-
NODE_10: '10.x',
5-
NODE_12: '12.x',
6-
NODE_14: '14.x'
7-
}
1+
variables:
2+
{ MODULE_VERSION: "1.2.2", NODE_10: "10.x", NODE_12: "12.x", NODE_14: "14.x", NODE_16: "16.x" }
83
name: $(MODULE_VERSION)-$(Date:yyyyMMdd)$(Rev:.r)
94

5+
pr:
6+
branches:
7+
include:
8+
- main
9+
- dev
10+
1011
trigger:
11-
- main
12-
- dev
12+
- main
13+
- dev
1314

1415
jobs:
15-
- job: UnitTests
16-
strategy:
17-
matrix:
18-
WINDOWS_NODE8:
19-
IMAGE_TYPE: 'vs2017-win2016'
20-
NODE_VERSION: $(NODE_8)
21-
WINDOWS_NODE10:
22-
IMAGE_TYPE: 'vs2017-win2016'
23-
NODE_VERSION: $(NODE_10)
24-
WINDOWS_NODE12:
25-
IMAGE_TYPE: 'vs2017-win2016'
26-
NODE_VERSION: $(NODE_12)
27-
WINDOWS_NODE14:
28-
IMAGE_TYPE: 'vs2017-win2016'
29-
NODE_VERSION: $(NODE_14)
30-
pool:
31-
vmImage: $(IMAGE_TYPE)
32-
steps:
33-
- task: NodeTool@0
34-
inputs:
35-
versionSpec: $(NODE_VERSION)
36-
displayName: 'Install Node.js'
37-
- script: npm install
38-
displayName: 'npm install'
39-
- script: npm run test
40-
displayName: 'npm build and test'
41-
condition: ne(variables['NODE_VERSION'], variables['NODE_8'])
42-
- script: npm run test:nolint
43-
displayName: 'npm build and test (no linting)'
44-
condition: eq(variables['NODE_VERSION'], variables['NODE_8'])
16+
- job: UnitTests
17+
strategy:
18+
matrix:
19+
UBUNTU_NODE10:
20+
IMAGE_TYPE: "ubuntu-latest"
21+
NODE_VERSION: $(NODE_10)
22+
UBUNTU_NODE12:
23+
IMAGE_TYPE: "ubuntu-latest"
24+
NODE_VERSION: $(NODE_12)
25+
UBUNTU_NODE14:
26+
IMAGE_TYPE: "ubuntu-latest"
27+
NODE_VERSION: $(NODE_14)
28+
UBUNTU_NODE16:
29+
IMAGE_TYPE: "ubuntu-latest"
30+
NODE_VERSION: $(NODE_16)
31+
WINDOWS_NODE10:
32+
IMAGE_TYPE: "windows-latest"
33+
NODE_VERSION: $(NODE_10)
34+
WINDOWS_NODE12:
35+
IMAGE_TYPE: "windows-latest"
36+
NODE_VERSION: $(NODE_12)
37+
WINDOWS_NODE14:
38+
IMAGE_TYPE: "windows-latest"
39+
NODE_VERSION: $(NODE_14)
40+
WINDOWS_NODE16:
41+
IMAGE_TYPE: "windows-latest"
42+
NODE_VERSION: $(NODE_16)
43+
MAC_NODE10:
44+
IMAGE_TYPE: "macOS-latest"
45+
NODE_VERSION: $(NODE_10)
46+
MAC_NODE12:
47+
IMAGE_TYPE: "macOS-latest"
48+
NODE_VERSION: $(NODE_12)
49+
MAC_NODE14:
50+
IMAGE_TYPE: "macOS-latest"
51+
NODE_VERSION: $(NODE_14)
52+
MAC_NODE16:
53+
IMAGE_TYPE: "macOS-latest"
54+
NODE_VERSION: $(NODE_16)
55+
pool:
56+
vmImage: $(IMAGE_TYPE)
57+
steps:
58+
- task: NodeTool@0
59+
inputs:
60+
versionSpec: $(NODE_VERSION)
61+
displayName: "Install Node dependencies"
62+
- script: npm ci
63+
displayName: "npm ci"
64+
- script: npm run test
65+
displayName: "npm build and test"
66+
- script: npm run test:nolint
67+
displayName: "npm build and test (no linting)"
68+
- job: BuildArtifacts
69+
pool:
70+
name: "1ES-Hosted-AzFunc"
71+
demands:
72+
- ImageOverride -equals MMSUbuntu20.04TLS
73+
steps:
74+
- task: NodeTool@0
75+
inputs:
76+
versionSpec: $(NODE_14)
77+
displayName: "Install Node.js"
78+
- script: npm ci
79+
displayName: "npm ci"
80+
- script: npm build
81+
displayName: "npm build"
82+
- script: npm prune --production
83+
displayName: "npm prune --production" # so that only production dependencies are included in SBOM
84+
- script: npm pack
85+
displayName: "pack npm package"
86+
- task: CopyFiles@2
87+
displayName: "Copy types package to staging"
88+
inputs:
89+
SourceFolder: $(System.DefaultWorkingDirectory)
90+
Contents: "*.tgz"
91+
TargetFolder: $(Build.ArtifactStagingDirectory)
92+
- task: ManifestGeneratorTask@0
93+
displayName: "SBOM Generation Task"
94+
inputs:
95+
BuildDropPath: "$(Build.ArtifactStagingDirectory)"
96+
Verbosity: "Information"
97+
- task: PublishBuildArtifacts@1
98+
inputs:
99+
PathtoPublish: "$(Build.ArtifactStagingDirectory)"
100+
ArtifactName: "drop"
101+
publishLocation: "Container"

0 commit comments

Comments
 (0)