Skip to content

Commit c747580

Browse files
authored
Merge pull request #1194 from microsoftgraph/ci/external-detect-secrets
ci/external detect secrets
2 parents b026a67 + 058f783 commit c747580

File tree

3 files changed

+7
-126
lines changed

3 files changed

+7
-126
lines changed

.azure-pipelines/ci-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ extends:
3737
jobs:
3838
- job: build
3939
pool:
40-
name: Azure-Pipelines-1ESPT-ExDShared
40+
name: 1es-ubuntu-latest-m
4141
os: linux
42-
image: ubuntu-latest
42+
4343
#TODO maybe missing template context with sdl baselines?
4444
steps:
4545
- checkout: self
@@ -65,19 +65,19 @@ extends:
6565
Copy-Item $(downloadLocalProperties.secureFilePath) local.properties -Verbose
6666
displayName: Copy secring and 'local.properties'
6767
68-
- script: ./gradlew --no-daemon publishToMavenLocal -PmavenCentralPublishingEnabled=true -PmavenCentralSnapshotArtifactSuffix=""
68+
- script: ./gradlew publishToMavenLocal -PmavenCentralPublishingEnabled=true -PmavenCentralSnapshotArtifactSuffix=""
6969
displayName: Publish to local Maven for verification
7070
condition: contains(variables['build.sourceBranch'], 'refs/tags/v')
7171

72-
- script: ./gradlew --no-daemon publishToMavenLocal -PmavenCentralPublishingEnabled=true
72+
- script: ./gradlew publishToMavenLocal -PmavenCentralPublishingEnabled=true
7373
displayName: Publish to local Maven for verification
7474
condition: not(contains(variables['build.sourceBranch'], 'refs/tags/v'))
7575

76-
- script: ./gradlew --no-daemon publishMavenPublicationToADORepository -PmavenCentralPublishingEnabled=true -PmavenCentralSnapshotArtifactSuffix=""
76+
- script: ./gradlew publishMavenPublicationToADORepository -PmavenCentralPublishingEnabled=true -PmavenCentralSnapshotArtifactSuffix=""
7777
displayName: Publish to local Maven ADO for ESRP
7878
condition: contains(variables['build.sourceBranch'], 'refs/tags/v')
7979

80-
- script: ./gradlew --no-daemon publishMavenPublicationToADORepository -PmavenCentralPublishingEnabled=true
80+
- script: ./gradlew publishMavenPublicationToADORepository -PmavenCentralPublishingEnabled=true
8181
displayName: Publish to local Maven ADO for ESRP
8282
condition: not(contains(variables['build.sourceBranch'], 'refs/tags/v'))
8383

@@ -227,4 +227,4 @@ extends:
227227
approvers: mmainer@microsoft.com
228228
serviceendpointurl: "https://api.esrp.microsoft.com"
229229
mainpublisher: "ESRPRELPACMAN"
230-
domaintenantid: "cdc5aeea-15c5-4db6-b079-fcadd2505dc2"
230+
domaintenantid: "cdc5aeea-15c5-4db6-b079-fcadd2505dc2"

.github/workflows/gradle-build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
java-version: 21
2222
distribution: 'temurin'
2323
cache: gradle
24-
- name: Detect secrets
25-
run: |
26-
pip install detect-secrets
27-
git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline
2824
- name: Move generated sources to correct package
2925
run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\beta\generated'
3026
shell: pwsh

.secrets.baseline

Lines changed: 0 additions & 115 deletions
This file was deleted.

0 commit comments

Comments
 (0)