Merge branch 'main' into logrecord-to-sdk

lalitb · May 7, 2024 · aba3367 · aba3367
2 parents 0febbd8 + cb67a4b
commit aba3367
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/.github/repository-settings.md b/.github/repository-settings.md
@@ -4,6 +4,13 @@ Maintainers are expected to maintain this log. This is required as per
 [OpenTelemetry Community
 guidelines](https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md#collaborators-and-teams).
 
+## May 6th 2024
+
+Modified branch protection for main branch to require the following CI checks as
+we now added Windows to CI.
+test (ubuntu-latest, stable)
+test (stable, windows-latest)
+
 ## April 30th 2024
 
 Modified branch protection for main branch to require the following CI checks:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,10 +12,17 @@ jobs:
   test:
     strategy:
       matrix:
+        # test both stable and beta versions of Rust on ubuntu-latest
+        os: [ubuntu-latest]
         rust: [stable, beta]
-    runs-on: ubuntu-latest
+        # test only stable version of Rust on Windows
+        include:
+          - rust: stable
+            os: windows-latest
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Free disk space
+      if: ${{ matrix.os == 'ubuntu-latest'}}
       run: |
         df -h
         sudo rm -rf /usr/local/lib/android
@@ -32,7 +39,7 @@ jobs:
       run: rustup set profile minimal
     - uses: arduino/setup-protoc@v3
     - name: Test
-      run: ./scripts/test.sh
+      run: bash ./scripts/test.sh
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -48,12 +55,12 @@ jobs:
         command: fmt
         args: --all -- --check
     - name: Lint
-      run: ./scripts/lint.sh
+      run: bash ./scripts/lint.sh
   external-types:
     strategy:
       matrix:
         example: [opentelemetry, opentelemetry-sdk, opentelemetry-otlp, opentelemetry-zipkin]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest # TODO: Check if this could be covered for Windows. The step used currently fails on Windows.
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly
@@ -68,8 +75,9 @@ jobs:
   non-default-examples:
     strategy:
       matrix:
+        os: [ windows-latest, ubuntu-latest ]
         example: [opentelemetry-otlp/examples/basic-otlp]
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -83,21 +91,24 @@ jobs:
         cd ${{ matrix.example }}
         cargo build --verbose
   msrv:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ windows-latest, ubuntu-latest ]
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
     - uses: dtolnay/rust-toolchain@1.65.0
     - name: Patch dependencies versions # some dependencies bump MSRV without major version bump
-      run: ./scripts/patch_dependencies.sh
+      run: bash ./scripts/patch_dependencies.sh
     - name: Run tests
       run: cargo --version &&
         cargo test --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,testing &&
         cargo test --manifest-path=opentelemetry-jaeger/Cargo.toml --features rt-tokio &&
         cargo test --manifest-path=opentelemetry-zipkin/Cargo.toml
   cargo-deny:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest # This uses the step `EmbarkStudios/cargo-deny-action@v1` which is only supported on Linux
     continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
     steps:
       - uses: actions/checkout@v4