Skip to content

Commit

Permalink
Merge branch 'main' into upstream-main
Browse files Browse the repository at this point in the history
  • Loading branch information
dimitarvdimitrov committed Sep 13, 2023
2 parents b6f903b + 7c06746 commit 6512e72
Show file tree
Hide file tree
Showing 95 changed files with 9,011 additions and 946 deletions.
8 changes: 0 additions & 8 deletions .github/CODEOWNERS

This file was deleted.

9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,35 @@ updates:
directory: "/"
schedule:
interval: "monthly"
<<<<<<< HEAD
groups:
k8s.io:
patterns:
- "k8s.io/*"
go.opentelemetry.io:
patterns:
- "go.opentelemetry.io/*"
=======
# Disable version updates; we will get them when we update from upstream Prometheus.
open-pull-requests-limit: 0
>>>>>>> main
- package-ecosystem: "gomod"
directory: "/documentation/examples/remote_storage"
schedule:
interval: "monthly"
open-pull-requests-limit: 0
- package-ecosystem: "npm"
directory: "/web/ui"
schedule:
interval: "monthly"
open-pull-requests-limit: 0
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
open-pull-requests-limit: 0
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "monthly"
open-pull-requests-limit: 0
61 changes: 0 additions & 61 deletions .github/workflows/funcbench.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/fuzzing.yml

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: golangci-lint
on:
push:
paths:
- "go.sum"
- "go.mod"
- "**.go"
- "scripts/errcheck_excludes.txt"
- ".github/workflows/golangci-lint.yml"
- ".golangci.yml"
pull_request:

jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: install Go
uses: actions/setup-go@v2
with:
go-version: '>=1.20 <1.21'
- name: Install snmp_exporter/generator dependencies
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
if: github.repository == 'prometheus/snmp_exporter'
- name: Lint
uses: golangci/golangci-lint-action@v3.3.1
with:
version: v1.52.2
126 changes: 0 additions & 126 deletions .github/workflows/prombench.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/repo_sync.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/sync-fork.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: sync fork with upstream

on:
schedule:
- cron: '11 8 * * 1' # 8:11 UTC on Monday

workflow_dispatch: # for manual testing

jobs:
sync-fork-pr:
runs-on: ubuntu-latest
steps:
- uses: tgymnich/fork-sync@v1.7
with:
owner: grafana
base: main
head: main
54 changes: 54 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: ci
on:
push:
branches: [main]
pull_request:

jobs:
test:
runs-on: ubuntu-20.04
steps:
- name: Upgrade golang
run: |
cd /tmp
wget https://dl.google.com/go/go1.20.3.linux-amd64.tar.gz
tar -zxvf go1.20.3.linux-amd64.tar.gz
sudo rm -fr /usr/local/go
sudo mv /tmp/go /usr/local/go
cd -
ls -l /usr/bin/go
- name: Checkout Repo
uses: actions/checkout@v2

# This file would normally be created by `make assets`, here we just
# mock it because the file is required for the tests to pass.
- name: Mock building of necessary react file
run: mkdir web/ui/static/react && touch web/ui/static/react/index.html

- name: Run Tests
run: GO=/usr/local/go/bin/go make common-test

test-stringlabels:
runs-on: ubuntu-20.04
steps:
- name: Upgrade golang
run: |
cd /tmp
wget https://dl.google.com/go/go1.20.3.linux-amd64.tar.gz
tar -zxvf go1.20.3.linux-amd64.tar.gz
sudo rm -fr /usr/local/go
sudo mv /tmp/go /usr/local/go
cd -
ls -l /usr/bin/go
- name: Checkout Repo
uses: actions/checkout@v2

# This file would normally be created by `make assets`, here we just
# mock it because the file is required for the tests to pass.
- name: Mock building of necessary react file
run: mkdir web/ui/static/react && touch web/ui/static/react/index.html

- name: Run Tests -tags=stringlabels
run: GO=/usr/local/go/bin/go GOOPTS=-tags=stringlabels make common-test
Loading

0 comments on commit 6512e72

Please sign in to comment.