Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into go_1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
blkperl committed Mar 13, 2024
2 parents 88ac5b1 + 755abad commit ae08be0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
6 changes: 5 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@ updates:
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "monthly"
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
container:
image: quay.io/prometheus/golang-builder:1.22-base
steps:
- uses: actions/checkout@v3
- uses: prometheus/promci@v0.0.2
- uses: actions/checkout@v4
- uses: prometheus/promci@v0.1.0
- uses: ./.github/promci/actions/setup_environment
- run: make

Expand All @@ -24,8 +24,8 @@ jobs:
matrix:
thread: [ 0, 1, 2 ]
steps:
- uses: actions/checkout@v3
- uses: prometheus/promci@v0.0.2
- uses: actions/checkout@v4
- uses: prometheus/promci@v0.1.0
- uses: ./.github/promci/actions/build
with:
parallelism: 3
Expand All @@ -36,15 +36,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: '<1.22'
- name: Lint
uses: golangci/golangci-lint-action@v3.2.0
uses: golangci/golangci-lint-action@v4.0.0
with:
version: v1.51.1
version: v1.56.2

# modified from the original as this repo still using master, insteead of main
publish_master:
Expand All @@ -53,7 +53,7 @@ jobs:
needs: [test, build]
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: prometheus/promci@v0.1.0
- uses: ./.github/promci/actions/publish_main
with:
Expand All @@ -70,7 +70,7 @@ jobs:
needs: [test, build]
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: prometheus/promci@v0.1.0
- uses: ./.github/promci/actions/publish_release
with:
Expand Down

0 comments on commit ae08be0

Please sign in to comment.