Skip to content

Commit

Permalink
fix: merge errors in github workflow files and formatting issues (#1022)
Browse files Browse the repository at this point in the history
  • Loading branch information
ymc9 authored Feb 21, 2024
2 parents d296e5f + 6867e79 commit 252151c
Show file tree
Hide file tree
Showing 6 changed files with 301 additions and 315 deletions.
229 changes: 114 additions & 115 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,119 +1,118 @@

version: 2
updates:
- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/"
- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/ide/jetbrains'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/language'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/misc/redwood'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/plugins/openapi'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/plugins/swr'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/plugins/tanstack-query'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/plugins/trpc'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/runtime'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/sdk'

- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/server'

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/ide/jetbrains"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/language"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/misc/redwood"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/plugins/openapi"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/plugins/swr"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/plugins/tanstack-query"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/plugins/trpc"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/runtime"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/sdk"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/server"

- package-ecosystem: "npm"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/packages/testtools"
- package-ecosystem: 'npm'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/packages/testtools'

- package-ecosystem: "github-actions"
schedule:
interval: "daily"
time: "02:00"
commit-message:
prefix: ":arrow_up: maint"
include: scope
directory: "/"
- package-ecosystem: 'github-actions'
schedule:
interval: 'daily'
time: '02:00'
commit-message:
prefix: ':arrow_up: maint'
include: scope
directory: '/'
28 changes: 14 additions & 14 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ env:
DO_NOT_TRACK: '1'

on:
merge_group:
push:
branches:
- main
- dev
- release/*
- v2
pull_request:
branches:
- main
- dev
- release/*
- v2
merge_group:
push:
branches:
- main
- dev
- release/*
- v2
pull_request:
branches:
- main
- dev
- release/*
- v2

permissions:
contents: read
contents: read

jobs:
build-test:
Expand Down
88 changes: 41 additions & 47 deletions .github/workflows/security-defender-for-devops.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
#
# Microsoft Security DevOps (MSDO) is a command line application which integrates static analysis tools into the development cycle.
# MSDO installs, configures and runs the latest versions of static analysis tools
# (including, but not limited to, SDL/security and compliance tools).
Expand All @@ -20,53 +14,53 @@
name: Security - Microsoft Defender For Devops

on:
merge_group:
push:
branches:
- main
- dev
- release/*
- v2
pull_request:
branches:
- main
- dev
- release/*
- v2
schedule:
- cron: '34 12 * * 0'
merge_group:
push:
branches:
- main
- dev
- release/*
- v2
pull_request:
branches:
- main
- dev
- release/*
- v2
schedule:
- cron: '34 12 * * 0'

permissions:
contents: read
security-events: read
contents: read
security-events: read

jobs:
MSDO:
# currently only windows latest is supported
runs-on: windows-latest
permissions:
security-events: write
MSDO:
# currently only windows latest is supported
runs-on: windows-latest
permissions:
security-events: write

steps:
- name: Harden Runner
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
with:
egress-policy: audit
steps:
- name: Harden Runner
uses: step-security/[email protected]
with:
egress-policy: audit

# checks out the repository
- uses: actions/checkout@v4
# checks out the repository
- uses: actions/checkout@v4

- uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
with:
dotnet-version: |
5.0.x
6.0.x
- uses: actions/[email protected]
with:
dotnet-version: |
5.0.x
6.0.x
- name: Run Microsoft Security DevOps
uses: microsoft/[email protected]
id: msdo
- name: Run Microsoft Security DevOps
uses: microsoft/[email protected]
id: msdo

- name: Upload results to Security tab
uses: github/codeql-action/upload-sarif@1500a131381b66de0c52ac28abb13cd79f4b7ecc # v2.22.12
with:
sarif_file: ${{ steps.msdo.outputs.sarifFile }}
- name: Upload results to Security tab
uses: github/codeql-action/[email protected]
with:
sarif_file: ${{ steps.msdo.outputs.sarifFile }}
Loading

0 comments on commit 252151c

Please sign in to comment.