Skip to content

Commit a29d267

Browse files
Merge branch 'main' into michael.richey/dd-test-opt
2 parents a4261da + 05a19f5 commit a29d267

File tree

5 files changed

+42
-12
lines changed

5 files changed

+42
-12
lines changed

.github/workflows/build_publish_docker.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
name: Build and publish docker image
22

3+
permissions:
4+
contents: read
5+
packages: write
6+
attestations: write
7+
id-token: write
8+
39
on:
410
pull_request:
511
types: [closed]
@@ -14,12 +20,6 @@ jobs:
1420
if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/')
1521
runs-on: ubuntu-latest
1622

17-
permissions:
18-
contents: read
19-
packages: write
20-
attestations: write
21-
id-token: write
22-
2323
steps:
2424
- name: Checkout repository
2525
uses: actions/checkout@v4
@@ -41,6 +41,12 @@ jobs:
4141
suffix=
4242
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
4343

44+
- name: Set up QEMU
45+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392
46+
47+
- name: Set up Docker Buildx
48+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2
49+
4450
- name: Build and push Docker image
4551
id: push
4652
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
@@ -49,6 +55,7 @@ jobs:
4955
push: true
5056
tags: ${{ steps.meta.outputs.tags }}
5157
labels: ${{ steps.meta.outputs.labels }}
58+
platforms: linux/amd64,linux/arm64
5259

5360
- name: Generate artifact attestation
5461
uses: actions/attest-build-provenance@v1

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
name: Build executables
4242
strategy:
4343
matrix:
44-
os: [ubuntu-latest, windows-latest, macos-latest]
44+
os: [ubuntu-24.04-arm, ubuntu-latest, windows-latest, macos-latest]
4545
runs-on: ${{ matrix.os }}
4646
steps:
4747
- name: Set tag

.github/workflows/test.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ on:
1414
- reopened
1515
- reopened
1616
- ready_for_review
17+
schedule:
18+
# every hour, 9-5 eastern, M-F
19+
- cron: '45 12-21 * * 1-5'
1720

1821
env:
1922
DD_DESTINATION_API_KEY: ${{ secrets.DD_DESTINATION_API_KEY }}
@@ -32,11 +35,11 @@ jobs:
3235
test:
3336
strategy:
3437
matrix:
35-
os: [ubuntu-latest, windows-latest, macos-latest]
38+
os: [ubuntu-24.04-arm, ubuntu-latest, windows-latest, macos-latest]
3639
runs-on: ${{ matrix.os }}
3740
steps:
3841
- name: Install Python
39-
uses: actions/setup-python@v4
42+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
4043
with:
4144
python-version: 3.12
4245
- name: Checkout code
@@ -53,13 +56,13 @@ jobs:
5356
continue-on-error: true
5457
strategy:
5558
matrix:
56-
os: [ubuntu-latest, windows-latest, macos-latest]
59+
os: [ubuntu-24.04-arm, ubuntu-latest, windows-latest, macos-latest]
5760
runs-on: ${{ matrix.os }}
5861
steps:
5962
- uses: actions/checkout@v3
6063
with:
6164
fetch-depth: 0
62-
- uses: actions/setup-python@v4
65+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
6366
with:
6467
python-version: "3.12"
6568
- name: Install requirements

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# Changelog
22

3+
## 1.4.3 / 2025-05-09
4+
5+
### Fixed
6+
* Support migration of log indexes without Flex tier by @k4ji in https://github.com/DataDog/datadog-sync-cli/pull/333
7+
* Pin the pytest-recording library to resolve a windows build issue by @michael-richey in https://github.com/DataDog/datadog-sync-cli/pull/344
8+
### Added
9+
* Adding more python versions to testing by @michael-richey in https://github.com/DataDog/datadog-sync-cli/pull/326
10+
* Michael.richey/team members by @michael-richey in https://github.com/DataDog/datadog-sync-cli/pull/336
11+
* Produce an arm64 image by @michael-richey in https://github.com/DataDog/datadog-sync-cli/pull/319
12+
### Changed
13+
* Changes to make the tests run more reliably by @michael-richey in https://github.com/DataDog/datadog-sync-cli/pull/325
14+
* Narrow the scope of DDR checking based on the command by @michael-richey in https://github.com/DataDog/datadog-sync-cli/pull/335
15+
* Split resource files into multiple files by @michael-richey in https://github.com/DataDog/datadog-sync-cli/pull/339
16+
* Tests updated to be more independent and test multiple files by @michael-richey in https://github.com/DataDog/datadog-sync-cli/pull/341
17+
18+
## New Contributors
19+
* @k4ji made their first contribution in https://github.com/DataDog/datadog-sync-cli/pull/334
20+
21+
**Full Changelog**: https://github.com/DataDog/datadog-sync-cli/compare/1.4.2...1.4.3
22+
323
## 1.4.2 / 2025-02-13
424

525
### Fixed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ console_scripts =
4949

5050
[options.extras_require]
5151
tests =
52-
ddtrace>=2.21.1
52+
ddtrace==3.6.0
5353
black==24.3.0
5454
pytest==8.1.1
5555
pytest-black

0 commit comments

Comments
 (0)