diff --git a/.github/workflows/update-semconv-integration-branch.yml b/.github/workflows/update-semconv-integration-branch.yml index 6bda4e2cd865..cf551eced602 100644 --- a/.github/workflows/update-semconv-integration-branch.yml +++ b/.github/workflows/update-semconv-integration-branch.yml @@ -9,14 +9,14 @@ on: jobs: update-semconv-integration-branch: runs-on: ubuntu-latest - if: github.repository == 'open-telemetry/opentelemetry.io' + #if: github.repository == 'open-telemetry/opentelemetry.io' steps: - uses: actions/checkout@v4 with: # this is needed in order to do the rebase below fetch-depth: 0 # this is needed in order to trigger workflows when pushing new commits to the PR - token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + #token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} - name: Set environment variables env: @@ -86,7 +86,9 @@ jobs: sed -i "s/^\tsemconv-pin = .*/\tsemconv-pin = $commit_desc/" .gitmodules - if ! git diff-index --quiet HEAD; then + git add content-modules/semantic-conventions .gitmodules + + if ! git diff-index --quiet --cached HEAD; then git commit -am "Update semconv submodule to $commit_desc" git push fi diff --git a/.gitmodules b/.gitmodules index 71c59fb9748a..c9ab5cff945a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "content-modules/semantic-conventions"] path = content-modules/semantic-conventions url = https://github.com/open-telemetry/semantic-conventions - semconv-pin = v1.30.0 + semconv-pin = v1.32.0-91-gb1bfa2ea [submodule "content-modules/opamp-spec"] path = content-modules/opamp-spec url = https://github.com/open-telemetry/opamp-spec diff --git a/content-modules/semantic-conventions b/content-modules/semantic-conventions index ac424df0d09f..b1bfa2ea88fd 160000 --- a/content-modules/semantic-conventions +++ b/content-modules/semantic-conventions @@ -1 +1 @@ -Subproject commit ac424df0d09fae721913f2a399b90ac16ba960fd +Subproject commit b1bfa2ea88fd64bcabd031762bfdd64441cfd99e