Skip to content

Commit

Permalink
merging upstream and resolving conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaxyi committed Nov 13, 2024
2 parents cb7988a + 305b8c8 commit 9b2127c
Show file tree
Hide file tree
Showing 23,292 changed files with 825,882 additions and 725,031 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
77 changes: 35 additions & 42 deletions .github/labeler-issue-triage.yml

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions .github/labeler-pull-request-triage-type.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
bug:
- '- \[\s?(x|X)\s?\] Bug Fix'

enhancement:
- '- \[\s?(x|X)\s?\] Enhancement'

breaking-change:
- '- \[\s?(x|X)\s?\] Breaking Change'
65 changes: 25 additions & 40 deletions .github/labeler-pull-request-triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ dependencies:
- vendor/**/*
documentation:
- changed-files:
- any-glob-to-any-file:
- any-glob-to-any-file:
- website/**/*
tooling:
- changed-files:
- any-glob-to-any-file:
- any-glob-to-any-file:
- internal/tools/**/*
state-migration:
- changed-files:
- any-glob-to-any-file:
- any-glob-to-any-file:
- internal/services/**/migration/**/*
service/aadb2c:
- changed-files:
Expand Down Expand Up @@ -203,11 +203,6 @@ service/digital-twins:
- any-glob-to-any-file:
- internal/services/digitaltwins/**/*

service/disks:
- changed-files:
- any-glob-to-any-file:
- internal/services/disks/**/*

service/dns:
- changed-files:
- any-glob-to-any-file:
Expand All @@ -219,6 +214,11 @@ service/domain-services:
- any-glob-to-any-file:
- internal/services/domainservices/**/*

service/dynatrace:
- changed-files:
- any-glob-to-any-file:
- internal/services/dynatrace/**/*

service/elastic:
- changed-files:
- any-glob-to-any-file:
Expand All @@ -239,6 +239,11 @@ service/event-hubs:
- any-glob-to-any-file:
- internal/services/eventhub/**/*

service/extended-location:
- changed-files:
- any-glob-to-any-file:
- internal/services/extendedlocation/**/*

service/firewall:
- changed-files:
- any-glob-to-any-file:
Expand Down Expand Up @@ -289,11 +294,6 @@ service/iot-hub:
- any-glob-to-any-file:
- internal/services/iothub/**/*

service/iot-time-series:
- changed-files:
- any-glob-to-any-file:
- internal/services/iottimeseriesinsights/**/*

service/key-vault:
- changed-files:
- any-glob-to-any-file:
Expand All @@ -304,11 +304,6 @@ service/kusto:
- any-glob-to-any-file:
- internal/services/kusto/**/*

service/labservice:
- changed-files:
- any-glob-to-any-file:
- internal/services/labservice/**/*

service/lighthouse:
- changed-files:
- any-glob-to-any-file:
Expand All @@ -334,11 +329,6 @@ service/logic:
- any-glob-to-any-file:
- internal/services/logic/**/*

service/logz:
- changed-files:
- any-glob-to-any-file:
- internal/services/logz/**/*

service/machine-learning:
- changed-files:
- any-glob-to-any-file:
Expand Down Expand Up @@ -369,16 +359,6 @@ service/maps:
- any-glob-to-any-file:
- internal/services/maps/**/*

service/maria-db:
- changed-files:
- any-glob-to-any-file:
- internal/services/mariadb/**/*

service/media:
- changed-files:
- any-glob-to-any-file:
- internal/services/media/**/*

service/mixed-reality:
- changed-files:
- any-glob-to-any-file:
Expand All @@ -389,6 +369,11 @@ service/mobile-network:
- any-glob-to-any-file:
- internal/services/mobilenetwork/**/*

service/mongo-cluster:
- changed-files:
- any-glob-to-any-file:
- internal/services/mongocluster/**/*

service/monitor:
- changed-files:
- any-glob-to-any-file:
Expand Down Expand Up @@ -545,11 +530,6 @@ service/spring:
- any-glob-to-any-file:
- internal/services/springcloud/**/*

service/sql:
- changed-files:
- any-glob-to-any-file:
- internal/services/sql/**/*

service/storage:
- changed-files:
- any-glob-to-any-file:
Expand Down Expand Up @@ -585,10 +565,15 @@ service/traffic-manager:
- any-glob-to-any-file:
- internal/services/trafficmanager/**/*

service/video-analyzer:
service/trustedsigning:
- changed-files:
- any-glob-to-any-file:
- internal/services/codesigning/**/*

service/video-indexer:
- changed-files:
- any-glob-to-any-file:
- internal/services/videoanalyzer/**/*
- internal/services/videoindexer/**/*

service/virtual-desktops:
- changed-files:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automation-open-pull-request-go-sdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
permissions:
contents: read
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: "open a pull request"
id: open-pr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
permissions:
contents: read
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: "open a pull request"
id: open-pr
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/breaking-change-detection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
detect:
runs-on: custom-linux-small
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version-file: ./.go-version
- run: bash ./scripts/run-breaking-change-detection.sh
4 changes: 2 additions & 2 deletions .github/workflows/depscheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
depscheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version-file: ./.go-version
- run: bash scripts/gogetcookie.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/document-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
document-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version-file: ./.go-version
- run: bash scripts/gogetcookie.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gencheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
gencheck:
runs-on: custom-linux-large
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version-file: ./.go-version
- run: bash scripts/gogetcookie.sh
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/golint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
golint:
runs-on: custom-linux-large
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version-file: ./.go-version
- uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
- uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
with:
version: 'v1.55.1'
version: 'v1.61.0'
args: -v ./internal/...
save-artifacts-on-fail:
if: ${{ needs.golint.result }} == 'failure'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradually-deprecated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version-file: ./.go-version
- run: bash ./scripts/run-gradually-deprecated.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/increment-milestone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
increment-milestone:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: "Increment Milestone"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-opened.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
issue_triage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: github/issue-labeler@c1b0f9f52a63158c4adc09425e858e87b32e9685 # v3.4
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-milestone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
pull-requests: write
issues: write
steps:
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
# we cannot use go-version-file here because no repositories are checked out so there is no file to reference
go-version: '1.21.6'
go-version: '1.22.7'
- run: |
go install github.com/stephybun/link-milestone@latest
link-milestone
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mkdocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Publish
uses: mhausenblas/mkdocs-deploy-gh-pages@d77dd03172e96abbcdb081d8c948224762033653 # 1.26
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/provider-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
if: needs.secrets-check.outputs.available == 'true'
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version-file: ./.go-version

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-reviewed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo ${{ github.repository }} > wr_actions/ghrepo.txt
echo ${{ github.event.pull_request.number }} > wr_actions/prnumber.txt
echo "remove-waiting-response" > wr_actions/action.txt
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: artifact
path: wr_actions
20 changes: 20 additions & 0 deletions .github/workflows/pull-request-type.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Pull Request Type

permissions:
pull-requests: write

on:
pull_request_target:
types: [opened, edited]

jobs:
pr_triage_label_type:
runs-on: ubuntu-latest
steps:
- uses: github/issue-labeler@c1b0f9f52a63158c4adc09425e858e87b32e9685 # v3.4
continue-on-error: true
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler-pull-request-triage-type.yml
enable-versioned-regex: 0
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
configuration-path: .github/labeler-pull-request-triage.yml
repo-token: "${{ secrets.GITHUB_TOKEN }}"
- uses: CodelyTV/pr-size-labeler@56f6f0fc35c7cc0f72963b8467729e1120cb4bed # v1.10.0
- uses: CodelyTV/pr-size-labeler@c7a55a022747628b50f3eb5bf863b9e796b8f274 # v1.10.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
xs_label: 'size/XS'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
outputs:
version: ${{ steps.go-version.outputs.version }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- id: go-version
run: echo "version=$(cat ./.go-version)" >>${GITHUB_OUTPUT}
release-notes:
runs-on: custom-linux-xl
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Generate Release Notes
run: sed -n -e "1{/# /d;}" -e "2{/^$/d;}" -e "/# $(git describe --abbrev=0 --exclude="$(git describe --abbrev=0 --match='v*.*.*' --tags)" --match='v*.*.*' --tags | tr -d v)/q;p" CHANGELOG.md > release-notes.txt
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: release-notes
path: release-notes.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/save-artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
echo ${{ github.repository_owner }} > wr_actions/ghowner.txt
echo ${{ github.event.repository.name }} > wr_actions/ghrepo.txt
echo ${{ github.event.pull_request.number }} > wr_actions/prnumber.txt
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: artifact
path: wr_actions
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
detect:
runs-on: custom-linux-small
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
with:
go-version-file: ./.go-version
- run: bash ./scripts/run-static-analysis.sh
Loading

0 comments on commit 9b2127c

Please sign in to comment.