Skip to content

Commit

Permalink
Merge pull request #1251 from microsoftgraph/dev
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
ramsessanchez authored Oct 24, 2023
2 parents 3dd51ae + 3140ef9 commit 0d72a1e
Show file tree
Hide file tree
Showing 40 changed files with 378 additions and 789 deletions.
628 changes: 0 additions & 628 deletions .github/fabricbot.json

This file was deleted.

18 changes: 9 additions & 9 deletions .github/policies/msgraph-sdk-java-core-branch-protection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ configuration:
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
requiredApprovingReviewsCount: 1
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
requireCodeOwnersReview: false
requireCodeOwnersReview: true
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
requiresCommitSignatures: false
# Are conversations required to be resolved before merging? boolean
Expand All @@ -38,10 +38,10 @@ configuration:
- license/cla
- Build
- lint-api-level
- Analyze
- Analyze (java)
- build
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: false
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
Expand All @@ -64,7 +64,7 @@ configuration:
# Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
requiredApprovingReviewsCount: 1
# Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
requireCodeOwnersReview: false
requireCodeOwnersReview: true
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
requiresCommitSignatures: false
# Are conversations required to be resolved before merging? boolean
Expand All @@ -76,10 +76,10 @@ configuration:
- license/cla
- Build
- lint-api-level
- Analyze
- Analyze (java)
- build
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: false
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
Expand All @@ -106,18 +106,18 @@ configuration:
# Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
requiresCommitSignatures: false
# Are conversations required to be resolved before merging? boolean
requiresConversationResolution: false
requiresConversationResolution: true
# Are merge commits prohibited from being pushed to this branch. boolean
requiresLinearHistory: false
# Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
requiredStatusChecks:
- Analyze
- Analyze (java)
- Build
- build
- license/cla
- lint-api-level
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
requiresStrictStatusChecks: false
requiresStrictStatusChecks: true
# Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
restrictsPushes: false
# Restrict who can dismiss pull request reviews. boolean
Expand Down
118 changes: 118 additions & 0 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
id:
name: GitOps.PullRequestIssueManagement
description: GitOps.PullRequestIssueManagement primitive
owner:
resource: repository
disabled: false
where:
configuration:
resourceManagementConfiguration:
scheduledSearches:
- description:
frequencies:
- hourly:
hour: 6
filters:
- isIssue
- isOpen
- hasLabel:
label: 'Needs: author feedback'
- hasLabel:
label: no-recent-activity
- noActivitySince:
days: 3
- isNotLabeledWith:
label: service bug
actions:
- closeIssue
- description:
frequencies:
- hourly:
hour: 6
filters:
- isIssue
- isOpen
- hasLabel:
label: 'Needs: author feedback'
- noActivitySince:
days: 4
- isNotLabeledWith:
label: no-recent-activity
actions:
- addLabel:
label: no-recent-activity
- addReply:
reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**.
- description:
frequencies:
- hourly:
hour: 6
filters:
- isIssue
- isOpen
- hasLabel:
label: duplicate
- noActivitySince:
days: 1
actions:
- addReply:
reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes.
- closeIssue
eventResponderTasks:
- if:
- payloadType: Issue_Comment
- isAction:
action: Created
- isActivitySender:
issueAuthor: True
- hasLabel:
label: 'Needs: author feedback'
then:
- addLabel:
label: needs attention
- removeLabel:
label: 'Needs: author feedback'
description:
- if:
- payloadType: Issues
- not:
isAction:
action: Closed
- hasLabel:
label: no-recent-activity
then:
- removeLabel:
label: no-recent-activity
description:
- if:
- payloadType: Issues
- labelAdded:
label: service bug
then: []
description:
- if:
- payloadType: Issue_Comment
- activitySenderHasAssociation:
association: Contributor
- bodyContains:
pattern: '?'
isRegex: False
- bodyContains:
pattern: '@'
isRegex: False
then:
- addLabel:
label: 'Needs: author feedback'
description:
- if:
- payloadType: Issues
- or:
- isAssignedToSomeone
- isAction:
action: Closed
then:
- removeLabel:
label: ToTriage
description:
onFailure:
onSuccess:
8 changes: 4 additions & 4 deletions .github/workflows/api-level-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
lint-api-level:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 18
distribution: 'temurin'
java-version: 20
- name: Setup Android SDK
uses: android-actions/setup-android@v2.0.10
uses: android-actions/setup-android@v3.0.0
- name: Add execution right to the script
run: chmod +x gradlew
working-directory: ./android
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge-dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1.5.1
uses: dependabot/fetch-metadata@v1.6.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
name: maven_central_snapshot
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Easy detect-secrets
uses: RobertFischer/[email protected]
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: 18
distribution: 'adopt'
java-version: 20
distribution: 'temurin'
cache: gradle
- name: Download file
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
Expand All @@ -52,14 +52,14 @@ jobs:
name: maven_central_release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Easy detect-secrets
uses: RobertFischer/[email protected]
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: 18
distribution: 'adopt'
java-version: 20
distribution: 'temurin'
cache: gradle
- name: Download file
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
Expand Down Expand Up @@ -99,13 +99,13 @@ jobs:
env:
RELEASE_TAG: ""
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Version
id: GetVersion
run: .\scripts\getLatestVersion.ps1
shell: pwsh
- name: Create tag
uses: rickstaa/[email protected].2
uses: rickstaa/[email protected].4
with:
tag: ${{ steps.GetVersion.outputs.tag }}
- name: Queue Git Release
Expand Down
75 changes: 55 additions & 20 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,86 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
workflow_dispatch:
push:
branches: [dev, master]
branches: [ "dev", "master" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [dev]
branches: [ "dev" ]
schedule:
- cron: '0 1 * * 4'
workflow_dispatch:

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'java' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
# Use only 'java' to analyze code written in Java, Kotlin or both
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-java@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 18
java-version: 20
distribution: 'temurin'
cache: gradle

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
# Override language selection by uncommenting this and choosing your languages
with:
languages: java
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# - name: Autobuild
# uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

#- run: |
# make bootstrap
# make release
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .github/workflows/git-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
Git_Release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download Build Artifact
uses: dawidd6/action-download-artifact@v2.27.0
uses: dawidd6/action-download-artifact@v2.28.0
with:
workflow: build-and-publish.yml
workflow_conclusion: success
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: 18
distribution: 'adopt'
java-version: 20
distribution: 'temurin'
cache: gradle
- name: Easy detect-secrets
uses: RobertFischer/[email protected]
Expand Down
Loading

0 comments on commit 0d72a1e

Please sign in to comment.