Skip to content

Commit 6b24656

Browse files
Merge branch 'main' into kvice-freshness
2 parents 9413449 + 67b582f commit 6b24656

9 files changed

Lines changed: 108 additions & 21 deletions

File tree

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,41 @@
1-
name: Auto label and assign pull requests
1+
name: Assign and label PR
22

33
permissions:
44
pull-requests: write
55
contents: read
6+
actions: read
67

7-
on: [pull_request_target]
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
813

914
jobs:
15+
download-payload:
16+
name: Download and extract payload artifact
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
18+
with:
19+
WorkflowId: ${{ github.event.workflow_run.id }}
20+
OrgRepo: ${{ github.repository }}
21+
secrets:
22+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
1023

11-
auto-label-assign:
12-
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
13-
with:
14-
PayloadJson: ${{ toJSON(github) }}
15-
AutoAssignUsers: 1
16-
AutoLabel: 1
17-
ExcludedUserList: '["user1", "user2"]'
18-
ExcludedBranchList: '["branch1", "branch2"]'
19-
secrets:
20-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
label-assign:
25+
name: Run assign and label
26+
needs: [download-payload]
27+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
28+
with:
29+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
30+
AutoAssignUsers: 1
31+
AutoLabel: 1
32+
ExcludedUserList: '["user1", "user2"]'
33+
ExcludedBranchList: '["branch1", "branch2"]'
34+
secrets:
35+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
36+
37+
38+
39+
2140

22-
23-
41+
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Auto label Microsoft contributors
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
if: github.repository_visibility == 'public'
17+
name: Download and extract payload artifact
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
19+
with:
20+
WorkflowId: ${{ github.event.workflow_run.id }}
21+
OrgRepo: ${{ github.repository }}
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
25+
label-msft:
26+
name: Label Microsoft contributors
27+
if: github.repository_visibility == 'public'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
secrets:
33+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34+
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
35+
36+
37+
38+
39+
40+
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Background tasks
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
pull_request_target:
9+
10+
jobs:
11+
upload:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Save payload data
16+
env:
17+
PayloadJson: ${{ toJSON(github) }}
18+
AccessToken: ${{ github.token }}
19+
run: |
20+
mkdir -p ./pr
21+
echo $PayloadJson > ./pr/PayloadJson.json
22+
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
23+
- uses: actions/upload-artifact@v4
24+
with:
25+
name: PayloadJson
26+
path: pr/

.github/workflows/LiveMergeCheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Check max/live-compare-merge below
1+
name: PR can merge into branch
22

33
permissions:
44
pull-requests: write

.github/workflows/PrFileCount.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Check max/pr-file-count below
1+
name: PR file count less than limit
22

33
permissions:
44
pull-requests: write

.github/workflows/ProtectedFiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Check max/protected-file-check below
1+
name: PR has no protected files
22

33
permissions:
44
pull-requests: write

microsoft-365/admin/setup/add-domain.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ Check out this video and others on our [YouTube channel](https://go.microsoft.co
5959
6060
Your company might need multiple domain names for different purposes. For example, you might want to add a different spelling of your company name because customers are already using it and their communications have failed to reach you.
6161

62+
> [!TIP]
63+
> Where possible, we recommend that your organization use a custom domain name, as it can enhance your email's appearance and improve it's reputation.
64+
6265
1. In the Microsoft 365 admin center, choose <a href="https://go.microsoft.com/fwlink/p/?linkid=2171997" target="_blank">**Setup**</a>.
6366
1. Under **Get your custom domain set up**, select **View** > **Manage** > **Add domain**.
6467
1. Enter the new domain name that you want to add, and then select **Next**.

microsoft-365/admin/setup/domains-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ sections:
7171
answer: |
7272
A domain is a unique name that appears after the **@** sign in email addresses, and after **www.** in web addresses. It typically takes the form of your organization's name and a standard Internet suffix, such as *yourbusiness.com* or *stateuniversity.edu.*
7373
74-
Using a custom domain like "**rob\@contoso.com**" with Microsoft 365 can help build credibility and recognition for your brand.
74+
Using a custom domain like "**rob\@contoso.com**" with Microsoft 365 can help build credibility and recognition for your brand. It may also enhance your email reputation, depending on our email provider reducing the likelihood of your emails being marked as "spam".
7575
7676
You can [buy a domain in Microsoft 365 and we will set it up automatically](../get-help-with-domains/buy-a-domain-name.md), or you can buy or bring one you already own from a domain registrar.
7777

microsoft-365/admin/support-contact-info.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: VSBFY23
1515
search.appverid:
1616
- MET150
1717
description: "Learn how to get phone support for your Microsoft 365 for business subscription. You must be an admin for a business subscription to get support."
18-
ms.date: 10/27/2023
18+
ms.date: 07/29/2024
1919
---
2020

2121
# Find Microsoft 365 for business support phone numbers by country or region
@@ -3938,7 +3938,7 @@ English: 24 hours a day, 7 days a week
39383938
:::row:::
39393939
:::column:::
39403940
**Phone number:**\
3941-
000 800 440 2038\
3941+
000 8000 404 454\
39423942
Local toll-free
39433943

39443944
**Billing support hours:**\
@@ -4247,7 +4247,7 @@ English: 24 hours a day, 7 days a week
42474247
:::row:::
42484248
:::column:::
42494249
**Phone number:**\
4250-
011 2423254\
4250+
+94 72 600 0010\
42514251
Local call charges apply.
42524252

42534253
**Billing support hours:**\

0 commit comments

Comments
 (0)