Skip to content
Merged
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
102 changes: 0 additions & 102 deletions .ci/Jenkinsfile

This file was deleted.

59 changes: 0 additions & 59 deletions .ci/jobs/defaults.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .ci/jobs/ecs-logging-python-mbp.yml

This file was deleted.

49 changes: 49 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: test

on:
# Run daily at midnight
schedule:
- cron: "0 0 * * *"
push:
branches: [ "main" ]
paths-ignore: [ '*.md', '*.asciidoc' ]
pull_request:
branches: [ "main" ]
paths-ignore: [ '*.md', '*.asciidoc' ]

permissions:
contents: read

jobs:

pre-commit:
if: github.event_name != 'schedule'
name: Run pre-commit
runs-on: ubuntu-latest
steps:
- uses: elastic/apm-pipeline-library/.github/actions/pre-commit@current

lint:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.7'
- run: .ci/scripts/lint.sh

test:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
matrix:
python: [ '3.7', '3.8', '3.9', '3.10' ]
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- run: .ci/scripts/test.sh ${{ matrix.python }}
4 changes: 1 addition & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ repos:
- id: check-case-conflict
- id: check-executables-have-shebangs
- id: check-merge-conflict
- repo: git@github.com:elastic/apm-pipeline-library
- repo: https://github.com/elastic/apm-pipeline-library
rev: current
hooks:
- id: check-bash-syntax
- id: check-jenkins-pipelines
- id: check-jjbb
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.910
hooks:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ecs-logging-python

[![Build Status](https://apm-ci.elastic.co/job/apm-agent-python/job/ecs-logging-python-mbp/job/main/badge/icon)](https://apm-ci.elastic.co/blue/organizations/jenkins/apm-agent-python%2Fecs-logging-python-mbp/branches)
[![Build Status](https://github.com/elastic/ecs-logging-python/actions/workflows/test.yml/badge.svg)](https://github.com/elastic/ecs-logging-pythonactions/workflows/test.yml)
[![PyPI](https://img.shields.io/pypi/v/ecs-logging)](https://pypi.org/project/ecs-logging)
[![Versions Supported](https://img.shields.io/pypi/pyversions/ecs-logging)](https://pypi.org/project/ecs-logging)

Expand Down