Skip to content

Commit d98886b

Browse files
committed
Merge branch 'main' into levi/fix-windows-declspec-vars
2 parents b32f97d + b44bb77 commit d98886b

File tree

45 files changed

+2030
-226
lines changed

Some content is hidden

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

45 files changed

+2030
-226
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/rust
3+
{
4+
"name": "Rust (Alpine x86_64)",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/base:alpine", // more images at https://hub.docker.com/r/microsoft/devcontainers-base
7+
// Force x86_64 architecture (for testing on ARM Macs)
8+
"runArgs": [
9+
"--network=host",
10+
"--platform=linux/amd64"
11+
],
12+
// Use 'mounts' to make the cargo cache persistent in a Docker Volume.
13+
"mounts": [
14+
{
15+
"source": "devcontainer-cargo-cache-alpine-x86_64-${devcontainerId}",
16+
"target": "/usr/local/cargo",
17+
"type": "volume"
18+
}
19+
],
20+
"onCreateCommand": "sudo apk add --no-cache build-base rust cargo cargo-zsh-completion rust-src rustfmt cbindgen patchelf cmake",
21+
"customizations": {
22+
"vscode": {
23+
"extensions": [
24+
"rust-lang.rust-analyzer",
25+
"vadimcn.vscode-lldb",
26+
"tamasfe.even-better-toml"
27+
]
28+
}
29+
}
30+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
issuer: https://gitlab.ddbuild.io
2+
3+
subject_pattern: "project_path:DataDog/.*"
4+
5+
claim_pattern:
6+
project_id: "2260"
7+
ref: "(main|release|igor/versioning/.*)" # TODO: remove testing branch and uncomment ref_protected
8+
# ref_protected: "true"
9+
10+
permissions:
11+
contents: write

.github/workflows/pr-title-semver-check.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,9 @@ jobs:
206206
# Validation rules
207207
case "$TYPE" in
208208
fix)
209-
if [[ "$SEMVER_LEVEL" == "major" ]] || [[ "$SEMVER_LEVEL" == "minor" ]] || [[ "$SEMVER_LEVEL" == "none" ]]; then
209+
if [[ "$SEMVER_LEVEL" == "major" ]] && [[ -z "$IS_BREAKING_CHANGE" ]]; then
210+
VALIDATION_FAILED="true"
211+
elif [[ "$SEMVER_LEVEL" == "minor" ]] || [[ "$SEMVER_LEVEL" == "none" ]]; then
210212
VALIDATION_FAILED="true"
211213
fi
212214
;;

.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ jobs:
7575
env:
7676
RUSTFLAGS: "-C prefer-dynamic"
7777
RUST_BACKTRACE: full
78+
- name: Add file attributes to JUnit XML
79+
if: success() || failure()
80+
shell: bash
81+
run: cargo run --bin add_junit_file_attributes -- target/nextest/ci/junit.xml
7882
- name: Report Test Results
7983
if: success() || failure()
8084
uses: mikepenz/action-junit-report@db71d41eb79864e25ab0337e395c352e84523afe # 4.3.1

0 commit comments

Comments
 (0)