Skip to content

Commit a848f82

Browse files
authored
Merge pull request #930 from microsoftgraph/bugfix/pipelines
bugfix/pipelines
2 parents 7f386cc + 89bb369 commit a848f82

24 files changed

Lines changed: 168 additions & 112 deletions

‎.github/policies/msgraph-sdk-java-core-branch-protection.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ configuration:
3838
- license/cla
3939
- Build
4040
- lint-api-level
41-
- Analyze
41+
- Analyze (java)
4242
- build
4343
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
4444
requiresStrictStatusChecks: false
@@ -76,7 +76,7 @@ configuration:
7676
- license/cla
7777
- Build
7878
- lint-api-level
79-
- Analyze
79+
- Analyze (java)
8080
- build
8181
# Require branches to be up to date before merging. Requires requiredStatusChecks. boolean
8282
requiresStrictStatusChecks: false
@@ -111,7 +111,7 @@ configuration:
111111
requiresLinearHistory: false
112112
# 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
113113
requiredStatusChecks:
114-
- Analyze
114+
- Analyze (java)
115115
- Build
116116
- build
117117
- license/cla

‎.github/workflows/api-level-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
- uses: actions/checkout@v3
1919
- uses: actions/setup-java@v3
2020
with:
21-
distribution: 'adopt'
22-
java-version: 18
21+
distribution: 'temurin'
22+
java-version: 20
2323
- name: Setup Android SDK
2424
uses: android-actions/setup-android@v2.0.10
2525
- name: Add execution right to the script

‎.github/workflows/build-and-publish.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
- name: Set up JDK
2727
uses: actions/setup-java@v3
2828
with:
29-
java-version: 18
30-
distribution: 'adopt'
29+
java-version: 20
30+
distribution: 'temurin'
3131
cache: gradle
3232
- name: Download file
3333
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
@@ -58,8 +58,8 @@ jobs:
5858
- name: Set up JDK
5959
uses: actions/setup-java@v3
6060
with:
61-
java-version: 18
62-
distribution: 'adopt'
61+
java-version: 20
62+
distribution: 'temurin'
6363
cache: gradle
6464
- name: Download file
6565
run: .\scripts\decodeAndWrite.ps1 -encodedValue $env:ENCODED_VALUE -outputPath $env:OUTPUT_PATH
Lines changed: 54 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,86 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
112
name: "CodeQL"
213

314
on:
4-
workflow_dispatch:
515
push:
6-
branches: [dev, master]
16+
branches: [ "dev", "master" ]
717
pull_request:
818
# The branches below must be a subset of the branches above
9-
branches: [dev]
19+
branches: [ "dev" ]
1020
schedule:
1121
- cron: '0 1 * * 4'
22+
workflow_dispatch:
1223

1324
jobs:
1425
analyze:
1526
name: Analyze
16-
runs-on: ubuntu-latest
27+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
28+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
29+
permissions:
30+
actions: read
31+
contents: read
32+
security-events: write
33+
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
language: [ 'java' ]
38+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
39+
# Use only 'java' to analyze code written in Java, Kotlin or both
40+
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
41+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
1742

1843
steps:
1944
- name: Checkout repository
2045
uses: actions/checkout@v3
2146

22-
- uses: actions/setup-java@v3
47+
- name: Set up JDK
48+
uses: actions/setup-java@v3
2349
with:
24-
distribution: 'adopt'
25-
java-version: 18
50+
java-version: 20
51+
distribution: 'temurin'
52+
cache: gradle
2653

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

34-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
63+
# 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
64+
# queries: security-extended,security-and-quality
65+
66+
67+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
3568
# If this step fails, then you should remove it and run the build manually (see below)
36-
- name: Autobuild
37-
uses: github/codeql-action/autobuild@v2
69+
# - name: Autobuild
70+
# uses: github/codeql-action/autobuild@v2
3871

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

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

46-
#- run: |
47-
# make bootstrap
48-
# make release
78+
- name: Grant execute permission for gradlew
79+
run: chmod +x gradlew
80+
- name: Build with Gradle
81+
run: ./gradlew build
4982

5083
- name: Perform CodeQL Analysis
5184
uses: github/codeql-action/analyze@v2
85+
with:
86+
category: "/language:${{matrix.language}}"

‎.github/workflows/gradle-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Set up JDK
2020
uses: actions/setup-java@v3
2121
with:
22-
java-version: 18
23-
distribution: 'adopt'
22+
java-version: 20
23+
distribution: 'temurin'
2424
cache: gradle
2525
- name: Easy detect-secrets
2626
uses: RobertFischer/detect-secrets-action@v2.0.0

‎.github/workflows/sample-build-check.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- uses: actions/checkout@v3
1515
- uses: actions/setup-java@v3
1616
with:
17-
distribution: 'adopt'
18-
java-version: 18
17+
distribution: 'temurin'
18+
java-version: 20
1919
- name: Add execution right to the script
2020
run: chmod +x gradlew
2121
working-directory: ./samples/deviceCodeSample
@@ -28,8 +28,8 @@ jobs:
2828
- uses: actions/checkout@v3
2929
- uses: actions/setup-java@v3
3030
with:
31-
distribution: 'adopt'
32-
java-version: 18
31+
distribution: 'temurin'
32+
java-version: 20
3333
- name: Add execution right to the script
3434
run: chmod +x gradlew
3535
working-directory: ./samples/interactiveBrowserSample

‎.github/workflows/sonarcloud.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Set up JDK
2020
uses: actions/setup-java@v3
2121
with:
22-
java-version: 18
23-
distribution: 'adopt'
22+
java-version: 20
23+
distribution: 'temurin'
2424
cache: gradle
2525
- name: Cache SonarCloud packages
2626
uses: actions/cache@v3
2.2 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

‎android/gradlew‎

Lines changed: 18 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)