From 9c6f1ce620b2503992045dca4f3cd6b835a24aa5 Mon Sep 17 00:00:00 2001 From: sinanulker Date: Sun, 26 Feb 2023 01:20:58 +0100 Subject: [PATCH 1/5] Restructure compatibility testing --- .github/workflows/ci.yml | 18 +++++++++++++++++- CHANGELOG.md | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b693d70e2a1..227d32de684 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: name: opentelemetry-go-test-output path: ${{ env.TEST_RESULTS }} - compatibility-test: + compatibility-matrix: strategy: matrix: go-version: ["1.20", 1.19, 1.18] @@ -150,3 +150,19 @@ jobs: env: GOARCH: ${{ matrix.arch }} run: make test-short + + test-compatibility: + runs-on: ubuntu-latest + needs: [compatibility-matrix] + steps: + - name: Print result + run: echo ${{ needs.compatibility-matrix.result }} + - name: Interpret result + run: | + if [[ success == ${{ needs.compatibility-matrix.result }} ]] + then + echo "All matrix jobs passed!" + else + echo "One or more matrix jobs failed." + false + fi \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 39078e56970..7b2fbc36098 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - [bridge/ot] Fall-back to TextMap carrier when it's not ot.HttpHeaders. (#3679) - The `Collect` method of the `"go.opentelemetry.io/otel/sdk/metric".Reader` interface is updated to accept the `metricdata.ResourceMetrics` value the collection will be made into. This change is made to enable memory reuse by SDK users. (#3732) +- Restructure compatibility testing. ### Fixed From 5562ab86cd5852b05f18cda907e5235cbd2bc160 Mon Sep 17 00:00:00 2001 From: sinanulker Date: Sun, 26 Feb 2023 01:34:24 +0100 Subject: [PATCH 2/5] Add PR number into Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b2fbc36098..97d9d0905b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - [bridge/ot] Fall-back to TextMap carrier when it's not ot.HttpHeaders. (#3679) - The `Collect` method of the `"go.opentelemetry.io/otel/sdk/metric".Reader` interface is updated to accept the `metricdata.ResourceMetrics` value the collection will be made into. This change is made to enable memory reuse by SDK users. (#3732) -- Restructure compatibility testing. +- Restructure compatibility testing. (#3779) ### Fixed From 8488595d58728b48a682d2b9e59102559470f2c8 Mon Sep 17 00:00:00 2001 From: sinanulker Date: Sun, 26 Feb 2023 18:48:49 +0100 Subject: [PATCH 3/5] Keep the original name for compatibility matrix --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 227d32de684..89a534de15b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: name: opentelemetry-go-test-output path: ${{ env.TEST_RESULTS }} - compatibility-matrix: + compatibility-test: strategy: matrix: go-version: ["1.20", 1.19, 1.18] @@ -153,13 +153,13 @@ jobs: test-compatibility: runs-on: ubuntu-latest - needs: [compatibility-matrix] + needs: [compatibility-test] steps: - name: Print result - run: echo ${{ needs.compatibility-matrix.result }} + run: echo ${{ needs.compatibility-test.result }} - name: Interpret result run: | - if [[ success == ${{ needs.compatibility-matrix.result }} ]] + if [[ success == ${{ needs.compatibility-test.result }} ]] then echo "All matrix jobs passed!" else From 4baf0c948ee6cfb232a67c944ba4cb3bd3c308e6 Mon Sep 17 00:00:00 2001 From: sinanulker Date: Sun, 26 Feb 2023 21:03:08 +0100 Subject: [PATCH 4/5] Remove changelog entry --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97d9d0905b8..39078e56970 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - [bridge/ot] Fall-back to TextMap carrier when it's not ot.HttpHeaders. (#3679) - The `Collect` method of the `"go.opentelemetry.io/otel/sdk/metric".Reader` interface is updated to accept the `metricdata.ResourceMetrics` value the collection will be made into. This change is made to enable memory reuse by SDK users. (#3732) -- Restructure compatibility testing. (#3779) ### Fixed From 2227a5c00f0db4ca93dc3b2eb1ed23234fbd2b00 Mon Sep 17 00:00:00 2001 From: unicod3 Date: Mon, 27 Feb 2023 11:59:22 +0100 Subject: [PATCH 5/5] Apply suggestions --- .github/workflows/ci.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89a534de15b..95de05ee925 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,14 +155,7 @@ jobs: runs-on: ubuntu-latest needs: [compatibility-test] steps: - - name: Print result - run: echo ${{ needs.compatibility-test.result }} - - name: Interpret result + - name: Test if compatibility-test passed run: | - if [[ success == ${{ needs.compatibility-test.result }} ]] - then - echo "All matrix jobs passed!" - else - echo "One or more matrix jobs failed." - false - fi \ No newline at end of file + echo ${{ needs.compatibility-test.result }} + test ${{ needs.compatibility-test.result }} == "success" \ No newline at end of file