Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .azure-pipelines/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ extends:
jobs:
- job: build
pool:
name: Azure-Pipelines-1ESPT-ExDShared
name: 1es-ubuntu-latest-m
os: linux
image: ubuntu-latest

#TODO maybe missing template context with sdl baselines?
steps:
- checkout: self
Expand All @@ -65,19 +65,19 @@ extends:
Copy-Item $(downloadLocalProperties.secureFilePath) local.properties -Verbose
displayName: Copy secring and 'local.properties'

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

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

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

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

Expand Down Expand Up @@ -227,4 +227,4 @@ extends:
approvers: mmainer@microsoft.com
serviceendpointurl: "https://api.esrp.microsoft.com"
mainpublisher: "ESRPRELPACMAN"
domaintenantid: "cdc5aeea-15c5-4db6-b079-fcadd2505dc2"
domaintenantid: "cdc5aeea-15c5-4db6-b079-fcadd2505dc2"
4 changes: 0 additions & 4 deletions .github/workflows/gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ jobs:
java-version: 21
distribution: 'temurin'
cache: gradle
- name: Detect secrets
run: |
pip install detect-secrets
git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline
- name: Move generated sources to correct package
run: .\scripts\copyFilesOnBuild.ps1 -inputPath '.\src\main\java\com\microsoft\graph\beta\generated'
shell: pwsh
Expand Down
115 changes: 0 additions & 115 deletions .secrets.baseline

This file was deleted.

Loading