Skip to content

Commit 29b2a96

Browse files
authored
Merge branch 'main' into dependabot/gradle/android/com.android.tools.build-gradle-9.0.0
2 parents dd6e72b + 779bfb2 commit 29b2a96

File tree

4 files changed

+4
-79
lines changed

4 files changed

+4
-79
lines changed

.azure-pipelines/ci-build.yml

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -121,81 +121,6 @@ extends:
121121
condition: and(or(contains(variables['build.sourceBranch'], 'refs/tags/v'), eq(variables['build.sourceBranch'], '${{ parameters.previewBranch }}'),eq(variables['Build.Reason'], 'Manual')), succeeded())
122122
dependsOn: build
123123
jobs:
124-
- deployment: deploy_github
125-
condition: or(and(contains(variables['build.sourceBranch'], 'refs/tags/v'), succeeded()), and(eq('${{ parameters.deployToGitHub }}', 'true'), succeeded()))
126-
pool:
127-
name: Azure-Pipelines-1ESPT-ExDShared
128-
os: linux
129-
image: ubuntu-latest
130-
templateContext:
131-
type: releaseJob
132-
isProduction: true
133-
inputs:
134-
- input: pipelineArtifact
135-
artifactName: jars
136-
targetPath: "$(Pipeline.Workspace)"
137-
environment: kiota-github-releases
138-
strategy:
139-
runOnce:
140-
deploy:
141-
steps:
142-
- pwsh: |
143-
$zips = Get-ChildItem -Path "$(Pipeline.Workspace)" -Filter "*.jar"
144-
$zip = $zips | Select-Object -First 1
145-
$zipName = $zip.Name
146-
if ($zipName -match "\d+.\d+.\d+")
147-
{
148-
$version = $matches[0]
149-
echo "Current version is $version"
150-
echo "##vso[task.setvariable variable=artifactVersion;]$version"
151-
}
152-
else
153-
{
154-
Write-Error "No valid version found in jar file name."
155-
exit 1
156-
}
157-
158-
- task: GitHubRelease@1
159-
inputs:
160-
gitHubConnection: "microsoftkiota"
161-
tagSource: userSpecifiedTag
162-
tag: "v$(artifactVersion)"
163-
title: "v$(artifactVersion)"
164-
assets: |
165-
$(Pipeline.Workspace)/**/*.jar
166-
$(Pipeline.Workspace)/**/*.jar.md5
167-
$(Pipeline.Workspace)/**/*.jar.sha1
168-
$(Pipeline.Workspace)/**/*.jar.sha256
169-
$(Pipeline.Workspace)/**/*.jar.sha512
170-
$(Pipeline.Workspace)/**/*.jar.asc
171-
$(Pipeline.Workspace)/**/*.jar.asc.md5
172-
$(Pipeline.Workspace)/**/*.jar.asc.sha1
173-
$(Pipeline.Workspace)/**/*.jar.asc.sha256
174-
$(Pipeline.Workspace)/**/*.jar.asc.sha512
175-
$(Pipeline.Workspace)/**/*.pom
176-
$(Pipeline.Workspace)/**/*.pom.md5
177-
$(Pipeline.Workspace)/**/*.pom.sha1
178-
$(Pipeline.Workspace)/**/*.pom.sha256
179-
$(Pipeline.Workspace)/**/*.pom.sha512
180-
$(Pipeline.Workspace)/**/*.pom.asc
181-
$(Pipeline.Workspace)/**/*.pom.asc.md5
182-
$(Pipeline.Workspace)/**/*.pom.asc.sha1
183-
$(Pipeline.Workspace)/**/*.pom.asc.sha256
184-
$(Pipeline.Workspace)/**/*.pom.asc.sha512
185-
$(Pipeline.Workspace)/**/*.module
186-
$(Pipeline.Workspace)/**/*.module.md5
187-
$(Pipeline.Workspace)/**/*.module.sha1
188-
$(Pipeline.Workspace)/**/*.module.sha256
189-
$(Pipeline.Workspace)/**/*.module.sha512
190-
$(Pipeline.Workspace)/**/*.module.asc
191-
$(Pipeline.Workspace)/**/*.module.asc.md5
192-
$(Pipeline.Workspace)/**/*.module.asc.sha1
193-
$(Pipeline.Workspace)/**/*.module.asc.sha256
194-
$(Pipeline.Workspace)/**/*.module.asc.sha512
195-
196-
addChangeLog: false
197-
action: edit
198-
199124
- deployment: deploy_maven
200125
# snapshots are not supported by ESRP release for now, but they are planning to add support. When it happens, simply remove the condition
201126
condition: or(and(contains(variables['build.sourceBranch'], 'refs/tags/v'), succeeded()), and(eq('${{ parameters.deployToMaven }}', 'true'), succeeded()))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
working-directory: ./android
3232
- name: Upload linting results
3333
if: failure() && steps.lint.outcome == 'failure'
34-
uses: actions/upload-artifact@v5
34+
uses: actions/upload-artifact@v6
3535
with:
3636
name: lint-report
3737
path: ./android/build/reports

.github/workflows/auto-merge-dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Dependabot metadata
2121
id: metadata
22-
uses: dependabot/fetch-metadata@v2.4.0
22+
uses: dependabot/fetch-metadata@v2.5.0
2323
with:
2424
github-token: "${{ secrets.GITHUB_TOKEN }}"
2525

.github/workflows/gradle-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
run: ./gradlew build
3131
- name: Upload Unit Test Results
3232
if: ${{ always() }}
33-
uses: actions/upload-artifact@v5
33+
uses: actions/upload-artifact@v6
3434
with:
3535
name: UnitTests
3636
path: |
3737
build/reports/tests/test/**
3838
build/test-results/**
3939
- name: Upload a Build Artifact
40-
uses: actions/upload-artifact@v5
40+
uses: actions/upload-artifact@v6
4141
with:
4242
name: drop
4343
path: |

0 commit comments

Comments
 (0)