Skip to content

Commit

Permalink
Merge branch 'main' into hm/rm-useless-submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
MrAlias authored May 21, 2024
2 parents 162bb40 + bdf6b77 commit 997a7c8
Show file tree
Hide file tree
Showing 213 changed files with 4,074 additions and 2,613 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/version_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ assignees: ''
<!--- The current milestones can be found at https://github.com/open-telemetry/opentelemetry-go/milestones -->
- [ ] Complete [Milestone](https://github.com/open-telemetry/opentelemetry-go/milestone/<Release Milesone>)
<!-- markdownlint-enable MD034 -->
- [ ] Update contrib codebase to support changes about to be released (use a git sha version)
- [ ] [Update contrib codebase to support changes about to be released (use a git sha version)](https://github.com/open-telemetry/opentelemetry-go/blob/main/RELEASING.md#verify-changes-for-contrib-repository)
- [ ] [Pre-release](https://github.com/open-telemetry/opentelemetry-go/blob/main/RELEASING.md#pre-release)
- [ ] [Tag](https://github.com/open-telemetry/opentelemetry-go/blob/main/RELEASING.md#tag)
- [ ] [Release](https://github.com/open-telemetry/opentelemetry-go/blob/main/RELEASING.md#release)
Expand Down
318 changes: 0 additions & 318 deletions .github/dependabot.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:

env:
DEFAULT_GO_VERSION: "~1.22.2"
DEFAULT_GO_VERSION: "~1.22.3"
jobs:
benchmark:
name: Benchmarks
Expand All @@ -27,7 +27,7 @@ jobs:
path: ./benchmarks
key: ${{ runner.os }}-benchmark
- name: Store benchmarks result
uses: benchmark-action/github-action-benchmark@v1.20.1
uses: benchmark-action/github-action-benchmark@v1.20.3
with:
name: Benchmarks
tool: 'go'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
# backwards compatibility with the previous two minor releases and we
# explicitly test our code for these versions so keeping this at prior
# versions does not add value.
DEFAULT_GO_VERSION: "~1.22.2"
DEFAULT_GO_VERSION: "~1.22.3"
jobs:
lint:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Generate
run: make generate
- name: Run linters
run: make dependabot-check license-check lint vanity-import-check verify-readmes
run: make license-check lint vanity-import-check verify-readmes
- name: Build
run: make build
- name: Check clean repository
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
cp coverage.txt $TEST_RESULTS
cp coverage.html $TEST_RESULTS
- name: Upload coverage report
uses: codecov/codecov-action@v4.3.0
uses: codecov/codecov-action@v4.4.1
with:
file: ./coverage.txt
fail_ci_if_error: true
Expand All @@ -117,7 +117,7 @@ jobs:
compatibility-test:
strategy:
matrix:
go-version: ["~1.22.2", "~1.21.9"]
go-version: ["~1.22.3", "~1.21.10"]
platform:
- os: ubuntu-latest
arch: "386"
Expand Down
Loading

0 comments on commit 997a7c8

Please sign in to comment.