Skip to content

Commit 85de717

Browse files
author
Jeremie Poisson
committed
Merge remote-tracking branch 'origin/master' into users/jepoisso/objstoreprovider-versionerror
2 parents d6b57ec + 78e1885 commit 85de717

File tree

7 files changed

+125
-58
lines changed

7 files changed

+125
-58
lines changed

‎.azure-devops/release.yaml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
pr: none
2+
trigger:
3+
- master
4+
variables:
5+
- group: InfoSec-SecurityResults
6+
- name: tags
7+
value: production,externalfacing
8+
- name: serviceTreeID
9+
value: 21f0b890-e3a8-4c0b-b9e7-2f764f8b799c
10+
11+
resources:
12+
repositories:
13+
- repository: 1ESPipelineTemplates
14+
type: git
15+
name: 1ESPipelineTemplates/1ESPipelineTemplates
16+
ref: refs/tags/release
17+
18+
extends:
19+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
20+
21+
parameters:
22+
sdl:
23+
sourceAnalysisPool:
24+
name: Azure-Pipelines-1ESPT-ExDShared
25+
image: windows-2022
26+
os: windows
27+
stages:
28+
- stage: release
29+
variables:
30+
# OPTIONAL: Set this varibale to 'true' to enable signing in a target stage.
31+
# Remove if signing is not required.
32+
Build.ESRP.CodeSign.Enabled: false
33+
# OPTIONAL: To disable required tools not applicable in the pipeline set to false.
34+
# Supported values: BinSkim, Roslyn, ESLint, PREFast.
35+
Build.SDL.<Roslyn>.Enabled: false
36+
Build.SDL.<ESLint>.Enabled: true
37+
jobs:
38+
- job: Build
39+
displayName: Build ObjectStoreProvider Package
40+
pool:
41+
name: Azure-Pipelines-1ESPT-ExDShared
42+
image: ubuntu-latest
43+
os: linux
44+
templateContext:
45+
outputs:
46+
- output: pipelineArtifact
47+
targetPath: $(System.DefaultWorkingDirectory)/dist
48+
artifactName: package-$(Build.BuildId)-$(Build.BuildNumber)
49+
- output: pipelineArtifact
50+
targetPath: $(System.DefaultWorkingDirectory)/packages
51+
artifactName: npm-package-$(Build.BuildId)-$(Build.BuildNumber)
52+
steps:
53+
- checkout: self
54+
- task: NodeTool@0
55+
displayName: "Installing node"
56+
inputs:
57+
versionSpec: "16"
58+
- script: yarn --frozen-lockfile
59+
displayName: yarn
60+
- script: yarn build && yarn test:ci
61+
displayName: build and test [test]
62+
63+
- script: |
64+
mkdir -p $(System.DefaultWorkingDirectory)/packages
65+
npm pack --pack-destination $(System.DefaultWorkingDirectory)/packages
66+
displayName: "Generate npm package (.tgz)"
67+
68+
- job: Release
69+
displayName: ObjectStoreProvider Release
70+
dependsOn: Build
71+
pool:
72+
name: Azure-Pipelines-1ESPT-ExDShared
73+
image: ubuntu-latest
74+
os: linux
75+
templateContext:
76+
type: releaseJob
77+
isProduction: true
78+
inputs:
79+
- input: pipelineArtifact
80+
artifactName: npm-package-$(Build.BuildId)-$(Build.BuildNumber)
81+
targetPath: $(Pipeline.Workspace)/packages
82+
steps:
83+
- task: EsrpRelease@9
84+
displayName: "ESRP Release to npm"
85+
inputs:
86+
connectedservicename: $(Release.ConnectedServiceName)
87+
usemanagedidentity: true
88+
keyvaultname: $(Release.KeyVaultName)
89+
signcertname: $(Release.SignCertName)
90+
clientid: $(Release.ClientId)
91+
contenttype: "npm"
92+
folderlocation: $(Pipeline.Workspace)/packages
93+
owners: $(Release.Owners)
94+
approvers: $(Release.Approvers)
95+
mainpublisher: ESRPRELPACMAN
96+
domaintenantid: $(Release.DomainTenantId)

‎.config/1espt/PipelineAutobaseliningConfig.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
40:
5+
retail:
6+
source:
7+
eslint:
8+
lastModifiedDate: 2025-11-03
9+
psscriptanalyzer:
10+
lastModifiedDate: 2025-11-03
11+
armory:
12+
lastModifiedDate: 2025-11-03
13+
binary:
14+
binskim:
15+
lastModifiedDate: 2025-11-03
16+
spotbugs:
17+
lastModifiedDate: 2025-11-03

‎.github/workflows/pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# Sets up Node and an .npmrc file. This is the official Github supported way to set up node.
2727
- uses: actions/setup-node@v4
2828
with:
29-
node-version: "12"
29+
node-version: "16"
3030
registry-url: "https://registry.npmjs.org"
3131
cache: "yarn"
3232
always-auth: "true"
@@ -44,7 +44,7 @@ jobs:
4444
run: echo "CHROME_BIN = $CHROME_BIN FIREFOX_BIN = $FIREFOX_BIN"
4545

4646
- name: CI BUILD + UT
47-
run: yarn ci-test
47+
run: yarn build && yarn test
4848

4949
- name: Check whether version was bumped in PR
5050
id: actions_project_version_check

‎.github/workflows/push.yml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
*.user
66
/ObjectStoreProviderTestsPack.js
77
/dist
8+
/.config

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ yarn build
4444

4545
```bash
4646
yarn install
47-
yarn ci-test
47+
yarn build && yarn test
4848
```
4949

5050
## Testing

‎package.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"name": "@microsoft/objectstoreprovider",
3-
"version": "0.8.2",
3+
"version": "0.8.5",
44
"description": "A cross-browser object store library",
5-
"author": "Mukundan Kavanur Kidambi <mukav@microsoft.com>",
5+
"author": "DataStack Team eleretzk@microsoft.com",
66
"scripts": {
7-
"ci-test": "npm run build && npm run test",
87
"test": "npm run test:browser -- --single-run && npm run test:sharedworker -- --single-run && npm run test:webworker -- --single-run && npm run test:btree",
8+
"test:ci": "npm run test:browser:ci -- --single-run && npm run test:sharedworker:ci -- --single-run && npm run test:webworker:ci -- --single-run && npm run test:btree",
99
"test:browser": "npx karma start karma.browser.conf.js --browsers ChromeHeadless,FirefoxHeadless",
10+
"test:browser:ci": "npx karma start karma.browser.conf.js --browsers ChromeHeadless",
1011
"test:sharedworker": "npx karma start karma.webworker.conf.js --browsers ChromeHeadless,FirefoxHeadless",
12+
"test:sharedworker:ci": "npx karma start karma.webworker.conf.js --browsers ChromeHeadless",
1113
"test:webworker": "npx karma start karma.sharedworker.conf.js --browsers ChromeHeadless,FirefoxHeadless",
14+
"test:webworker:ci": "npx karma start karma.sharedworker.conf.js --browsers ChromeHeadless",
1215
"test:debug:browser": "npx karma start karma.browser.conf.js --browsers Chrome,Firefox",
1316
"test:debug:sharedworker": "npx karma start karma.webworker.conf.js --browsers Chrome,Firefox",
1417
"test:debug:webworker": "npx karma start karma.sharedworker.conf.js --browsers Chrome,Firefox",
@@ -30,7 +33,8 @@
3033
"sorted-btree": "^1.5.0"
3134
},
3235
"sideEffects": [
33-
"./src/Promise.extensions.ts"
36+
"./src/Promise.extensions.ts",
37+
"./dist/src/Promise.extensions.js"
3438
],
3539
"devDependencies": {
3640
"@types/assert": "^1.5.4",

0 commit comments

Comments
 (0)