Skip to content

Commit b136c9c

Browse files
authored
Merge pull request #2721 from DataDog/nogorodnikov/merge-develop-into-feature-context-sync-120625
Merge `develop` branch into the feature context synchronization branch
2 parents 59b6870 + 4efc0b2 commit b136c9c

File tree

323 files changed

+8836
-735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+8836
-735
lines changed

.github/workflows/changelog-to-confluence.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Prepare Only Changelog
1818
run: |
1919
mkdir -p publish_folder
20-
cp CHANGELOG.md publish_folder/
20+
cp CHANGELOG.md publish_folder/android-sdk-changelog.md
2121
echo "Publishing only CHANGELOG.md"
2222
2323
- name: Publish Markdown to Confluence

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ config/*
2929
# Kotlin
3030
.kotlin/
3131

32+
# dd-sdk-android tools
3233
gh_token
3334
sdk_classpath
3435
detekt_classpath
36+
**/verification-metadata.xml
37+
!gradle/verification-metadata.xml

0 commit comments

Comments
 (0)