Skip to content

Commit c04922e

Browse files
authored
Merge branch 'dev' into jasonjoh/update-doc-links
2 parents 5f09466 + d21aa12 commit c04922e

File tree

6 files changed

+135
-76
lines changed

6 files changed

+135
-76
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This file mirrors validate.yml and is designed to be a
2+
# "stand-in" that always passes so that pull requests are not
3+
# blocked waiting on the "Validate sample queries" workflow.
4+
# For context, validate.yml will only run if specific files are
5+
# updated in the PR. If a PR doesn't touch any of those files,
6+
# validate.yml will never run, but since it's a required status
7+
# check for PRs, the PR will be stuck waiting for the workflow to run.
8+
# This file solves that problem. For more info, see
9+
# https://github.com/orgs/community/discussions/44490
10+
name: Validate sample queries
11+
on:
12+
pull_request:
13+
paths-ignore:
14+
- sample-queries/sample-queries.json
15+
- scripts/**
16+
- tests/**
17+
- package.json
18+
- package-lock.json
19+
20+
jobs:
21+
validate-json-schema:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- run: 'echo "No validation required"'
25+
26+
test:
27+
runs-on: ubuntu-latest
28+
steps:
29+
- run: 'echo "No tests required"'

.github/workflows/validate.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
name: Validate sample queries
2-
on: [pull_request,push]
2+
on:
3+
push:
4+
paths:
5+
- sample-queries/sample-queries.json
6+
- scripts/**
7+
- tests/**
8+
- package.json
9+
- package-lock.json
10+
pull_request:
11+
paths:
12+
- sample-queries/sample-queries.json
13+
- scripts/**
14+
- tests/**
15+
- package.json
16+
- package-lock.json
317

418
jobs:
519
validate-json-schema:
@@ -18,8 +32,8 @@ jobs:
1832
steps:
1933
- uses: actions/checkout@v2
2034

21-
- name: Install
22-
run: npm install
35+
- name: Install
36+
run: npm install
2337

2438
- name: Run test
2539
run: npm run test

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ POST Example includes headers, post body and a tip <br>
6767
When done making the changes on the document,
6868
1. Save the document on your machine
6969
1. Create a Git branch on this repo and name it using your initials + describe the changes ie. bn/add-xyz-samples
70+
1. Run `npm run test` to test your changes locally
7071
1. Commit the changes to your branch
7172
1. Create a PR (the PR is automatically updated with the relevant reviewers).
7273

@@ -114,15 +115,18 @@ Then in the new Git command line window, paste in this command to create and che
114115
### 4. Update your sample query
115116
Now you can add, update or delete your sample query in the `sample-queries.json` file that opened up in VS Code earlier.
116117

117-
### 5. Add, commit and push your changes back to the remote repo with the following commands
118+
### 5. Test your changes locally
119+
Run `npm run test` to test your changes locally before committing.
120+
121+
### 6. Add, commit and push your changes back to the remote repo with the following commands
118122
- Add the changes to you local repo: `git add sample-queries.json`
119123
- Commit your changes: `git commit -m "{add-reason-for-update}"`
120124
- Push your changes to the remote repo: `git push origin {your-branch-name}`
121125

122-
### 6. Login to GitHub
126+
### 7. Login to GitHub
123127
Follow the instructions to login to GitHub using your credentials.
124128

125-
### 7. If you get error 403
129+
### 8. If you get error 403
126130
Follow the instructions specified, then run this command again:<br/>
127131
`git push origin {your-branch-name}`
128132

permissions/new/ProvisioningInfo.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12320,37 +12320,37 @@
1232012320
],
1232112321
"SharePointCrossTenantMigration.Read.All": [
1232212322
{
12323-
"id": "",
12323+
"id": "00dcb678-f9af-4e73-acb1-4f1657364629",
1232412324
"scheme": "DelegatedWork",
1232512325
"environment": "public",
1232612326
"isHidden": true,
12327-
"isEnabled": false,
12327+
"isEnabled": true,
1232812328
"resourceAppId": "00000003-0000-0000-c000-00000000000"
1232912329
},
1233012330
{
12331-
"id": "",
12331+
"id": "f5fa52a5-b9ab-4dc3-885e-9e5b4a67068e",
1233212332
"scheme": "Application",
1233312333
"environment": "public",
1233412334
"isHidden": true,
12335-
"isEnabled": false,
12335+
"isEnabled": true,
1233612336
"resourceAppId": "00000003-0000-0000-c000-00000000000"
1233712337
}
1233812338
],
1233912339
"SharePointCrossTenantMigration.Manage.All": [
1234012340
{
12341-
"id": "",
12341+
"id": "c608c170-08b5-466b-a8fe-0b4074b01613",
1234212342
"scheme": "DelegatedWork",
1234312343
"environment": "public",
1234412344
"isHidden": true,
12345-
"isEnabled": false,
12345+
"isEnabled": true,
1234612346
"resourceAppId": "00000003-0000-0000-c000-00000000000"
1234712347
},
1234812348
{
12349-
"id": "",
12349+
"id": "a0521574-fcd8-4742-b29c-f796df57ea70",
1235012350
"scheme": "Application",
1235112351
"environment": "public",
1235212352
"isHidden": true,
12353-
"isEnabled": false,
12353+
"isEnabled": true,
1235412354
"resourceAppId": "00000003-0000-0000-c000-00000000000"
1235512355
}
1235612356
],

0 commit comments

Comments
 (0)