Skip to content

Commit

Permalink
Merge branch 'main' into keyvault_required
Browse files Browse the repository at this point in the history
  • Loading branch information
l0lawrence authored Dec 3, 2024
2 parents b3f5221 + 3288cd8 commit 46aa142
Show file tree
Hide file tree
Showing 12,007 changed files with 1,746,894 additions and 41,744 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 3 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
# PRLabel: %Cognitive Services
/dev/cognitiveservices/data-plane/Language/ @assafi @rokulka @ChongTang @annatisch @heaths @deyaaeldeen @kristapratico @mssfang @joseharriaga @minhanh-phan @Azure/api-stewardship-board

/specification/adp/ @Azure/adp

# PRLabel: %FarmBeats
/specification/agrifood/data-plane @Azure/api-stewardship-board

Expand All @@ -37,7 +35,7 @@
/specification/applicationinsights/data-plane/Monitor.Exporters/ @ramthi @trask @hectorhdzg @lzchen @Azure/api-stewardship-board

# PRLabel: %Container Apps
/specification/app/ @Juliehzl
/specification/app/ @jijohn14 @Juliehzl

# PRLabel: %Code Signing
/specification/codesigning/data-plane @Azure/api-stewardship-board
Expand Down Expand Up @@ -249,7 +247,7 @@
/specification/subscriptions/ @navysingla

# PRLabel: %Synapses
/specification/synapse/ @wonner @yanjungao718
/specification/synapse/ @wanyang7 @yanjungao718

# PRLabel: %TimeseriesInsights
/specification/timeseriesinsights/ @sandshadow
Expand Down Expand Up @@ -287,5 +285,6 @@
/.azure-pipelines/ @weshaggard @mikeharder @benbp
/.github/ @weshaggard @mikeharder @benbp
/eng/ @weshaggard @mikeharder @benbp
/eng/common/ @Azure/azure-sdk-eng
/scripts/ @weshaggard @mikeharder
/.github/CODEOWNERS @Azure/azure-sdk-eng
27 changes: 27 additions & 0 deletions .github/actions/setup-node-npm-ci/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Setup Node and run `npm ci`
description: Uses specified Node version and runs npm commands to set up the environment for REST API CI

inputs:
node-version:
description: 'Node version to use'
default: 20.x

runs:
using: "composite"

steps:
- uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}

- run: |
echo "::group::npm ci"
npm ci
echo "::endgroup::"
shell: bash
- run: |
echo "::group::npm ls -a"
npm ls -a || true
echo "::endgroup::"
shell: bash
37 changes: 26 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
allow:
- dependency-name: "@azure-tools/*"
- dependency-name: "@typespec/*"
groups:
typespec:
patterns:
- "*"
- package-ecosystem: "npm"
directories:
- "/"
- "/eng/tools/**"
schedule:
interval: "daily"
ignore:
# Updated manually to align with minimum supported Node version
- dependency-name: "@types/node"
# Updated manually to align with repo microsoft/typespec
- dependency-name: "typescript"
- dependency-name: "prettier"
# Updated manually by the Liftr team
- dependency-name: "@azure-tools/typespec-liftr-base"
# minimatch@9 is the last version to support Node 18
- dependency-name: "minimatch"
versions: [ ">= 10.0.0"]
groups:
typespec:
patterns:
- "*typespec*"
eslint:
patterns:
- "*eslint*"
# Leave the constraint if the original constraint allows the new version, otherwise, bump the constraint.
versioning-strategy: increase-if-necessary
2 changes: 1 addition & 1 deletion .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1983,7 +1983,7 @@ configuration:
then:
- mentionUsers:
mentionees:
- wonner
- wanyang7
- yanjungao718
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
assignMentionees: False
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/_reusable-eng-tools-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,15 @@ jobs:
- uses: actions/checkout@v4
with:
sparse-checkout: |
.github
eng
${{ inputs.sparse-checkout-paths }}
- name: Use Node ${{ matrix.node-version }}.x
uses: actions/setup-node@v4
- name: Setup Node ${{ matrix.node-version }} and run `npm ci`
uses: ./.github/actions/setup-node-npm-ci
with:
node-version: ${{ matrix.node-version }}.x

- run: npm ci
shell: pwsh

- run: npm ls -a
shell: pwsh
continue-on-error: true

- run: npm run build
shell: pwsh
working-directory: ./eng/tools/${{ inputs.package }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/protected-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: pull_request

env:
# Users allowed to edit protected files without failing check
user-allowed: ${{ github.event.pull_request.user.login == 'azure-sdk' || github.event.pull_request.user.login == 'dependabot[bot]' }}
user-allowed: ${{ github.event.pull_request.user.login == 'azure-sdk' }}

jobs:
protected-files:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/suppressions-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- eng/tools/package.json
- eng/tools/tsconfig.json
- eng/tools/suppressions/**
workflow_dispatch:

jobs:
suppressions:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tsp-client-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
- specification/common-types
- specification/keyvault
- specification/sphere
workflow_dispatch:

jobs:
tsp-client:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/typespec-requirement-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- eng/tools/package.json
- eng/tools/tsconfig.json
- eng/tools/typespec-requirement/**
workflow_dispatch:

jobs:
typespec-requirement:
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/typespec-requirement.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,8 @@ jobs:
# Required since "HEAD^" is passed to TypeSpec-Requirement.ps1
fetch-depth: 2

- name: Use Node 20.0
uses: actions/setup-node@v4
with:
node-version: 20.0

- run: npm ci

- run: npm ls -a
continue-on-error: true
- name: Setup Node and run `npm ci`
uses: ./.github/actions/setup-node-npm-ci

- run: |
eng/scripts/TypeSpec-Requirement.ps1 `
Expand Down
83 changes: 83 additions & 0 deletions .github/workflows/typespec-validation-all.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: TypeSpec Validation - All

on:
push:
branches:
- main
- RPSaaSMaster
- typespec-next

pull_request:
branches:
- main
- RPSaaSMaster
- typespec-next
paths:
- .gitattributes
- .prettierrc.json
- package-lock.json
- package.json
- tsconfig.json
- eng/**
- specification/suppressions.yaml
- specification/common-types/**

# Workflow and workflow dependencies
- .github/workflows/typespec-validation-all.yaml
- .github/actions/setup-node-npm-ci/**

schedule:
# Run 4x/day
- cron: '0 0,6,12,18 * * *'

workflow_dispatch:

jobs:
typespec-validation-all:
# Use short name to maximize space for parameters in UI
name: TSV

strategy:
# Validate all specs, even if one job fails early
fail-fast: false
# Sort matrix elements from "most important" to "least important" for the best grouping and UI
# Keep matrix values short, to maximize number of parameters shown in UI
matrix:
# When triggered by schedule, validate both the default branch and typespec-next
# Use the placeholder string "default" instead of passing "" directly, since the latter gets ignored by
# the GitHub Jobs UI.
ref: ${{ fromJSON(github.event_name == 'schedule' && '["default", "next"]' || '["default"]') }}
os: [ubuntu, windows]
# shards must start at 0 and increment by 1
shard: [0, 1, 2]
# total-shards must be an accurate count of the number of shards
total-shards: [3]

runs-on: ${{ matrix.os }}-latest

steps:
- name: Enable git long paths
if: runner.os == 'Windows'
run: git config --global core.longpaths true

- uses: actions/checkout@v4
with:
# Convert placeholder string 'default' to '', which tells the action to checkout the default ref.
ref: ${{ matrix.ref == 'next' && 'typespec-next' || '' }}

- name: Setup Node and run `npm ci`
uses: ./.github/actions/setup-node-npm-ci

- name: Validate All Specs
run: |
# Keep processing when errors are written. Nonzero exit will mark the
# step as failed.
$ErrorActionPreference = 'Continue'
./eng/scripts/TypeSpec-Validation.ps1 `
-Shard ${{ matrix.shard }} `
-TotalShards ${{ matrix.total-shards }} `
-CheckAll `
-GitClean `
-Verbose
shell: pwsh
1 change: 1 addition & 0 deletions .github/workflows/typespec-validation-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
- eng/tools/tsconfig.json
- eng/tools/suppressions/**
- eng/tools/typespec-validation/**
workflow_dispatch:

jobs:
typespec-validation:
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/typespec-validation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: TypeSpec Validation

on: pull_request

jobs:
typespec-validation:
name: TypeSpec Validation
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2

- name: Setup Node and run `npm ci`
uses: ./.github/actions/setup-node-npm-ci

- name: Validate Impacted Specs
run: |
# Keep processing when errors are written. Nonzero exit will mark the
# step as failed.
$ErrorActionPreference = 'Continue'
./eng/scripts/TypeSpec-Validation.ps1 -GitClean -Verbose
shell: pwsh
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ eng/tools/**/dist
!eng/tools/**/cmd/*.js
!eng/tools/**/eslint.config.js

# TypeScript cache
*.tsbuildinfo

# No package-lock.json files should be commited except the top-level.
**/package-lock.json
!/package-lock.json
Expand Down
Loading

0 comments on commit 46aa142

Please sign in to comment.