Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all non-CD actions to run against main branch #1170

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/chart-lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Chart Lint
on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'charts/**'
Expand All @@ -11,7 +11,7 @@ on:
- 'Makefile'

pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'charts/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-python-dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Check Python dependencies
on:
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'pyproject.toml'
- 'poetry.lock'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Continuos Integration

on:
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/ci.yml'
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/conftest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Conftest

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '_test/**'
- 'charts/**'
- '.github/workflows/conftest.yml'
- 'Makefile'

pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '_test/**'
- 'charts/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-check.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Documentation check
on:
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'docs/**'
- '.github/workflows/doc-check.yml'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mockoon-tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Mockoon Tests
on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'mocks/**'
Expand All @@ -11,7 +11,7 @@ on:
- 'scripts/run-mockoon-tests.sh'

pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'mocks/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ name: Pre-commit test

on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '.pre-commit-config.yaml'
- '.github/workflows/pre-commit-test.yml'
- 'Makefile'

pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.pre-commit-config.yaml'
- '.github/workflows/pre-commit-test.yml'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prometheus-rules.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Prometheus Rules Tests
on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '_test/**'
- 'charts/pelorus/**'
- '.github/workflows/prometheus-rules.yml'

pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '_test/**'
- 'charts/pelorus/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-formatting.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Check Python Formatting
on:
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/python-formatting.yml'
- 'pyproject.toml'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-linting.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Pylava
on:
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'pyproject.toml'
- '.github/workflows/python-linting.yml'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Shellcheck Tests
on:
push:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/shellcheck.yml'
- 'Makefile'
- '**.sh'
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- '.github/workflows/shellcheck.yml'
- 'Makefile'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-test-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Trigger test images

on:
pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'charts/**'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/typecheck.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Type Check (ignore failures for now)
on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'pyproject.toml'
- '.github/workflows/typecheck.yml'
- 'Makefile'

pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'pyproject.toml'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Unit Tests
on:
push:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'pyproject.toml'
- '.github/workflows/unittests.yml'
- 'Makefile'

pull_request:
branches: [ master ]
branches: [ main ]
paths:
- 'exporters/**'
- 'pyproject.toml'
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,15 @@

> [!WARNING]
> This is NOT the active branch for pelorus. This is _Pelorus Next_, a future iteration of this repo that is not yet active. Please switch to the [master](https://github.com/dora-metrics/pelorus/tree/master) branch for the current active iteration of Pelorus.

[![Python Linting](https://github.com/dora-metrics/pelorus/actions/workflows/python-linting.yml/badge.svg)](https://github.com/dora-metrics/pelorus/actions)
[![Unit tests](https://github.com/dora-metrics/pelorus/actions/workflows/unittests.yml/badge.svg)](https://github.com/dora-metrics/pelorus/actions)
[![Conftest](https://github.com/dora-metrics/pelorus/actions/workflows/conftest.yml/badge.svg)](https://github.com/dora-metrics/pelorus/actions)
[![Chart Lint](https://github.com/dora-metrics/pelorus/actions/workflows/chart-lint.yml/badge.svg)](https://github.com/dora-metrics/pelorus/actions)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)

Prow CI Periodic E2E Tests:

- OpenShift version 4.16 [![4.16 scenario 1 builds](https://prow.ci.openshift.org/badge.svg?jobs=periodic-ci-dora-metrics-pelorus-master-4.16-e2e-openshift-test-scenario-1-periodic)](https://prow.ci.openshift.org/job-history/gs/origin-ci-test/logs/periodic-ci-dora-metrics-pelorus-master-4.16 -e2e-openshift-test-scenario-1-periodic)
Loading