Skip to content

Commit

Permalink
Merge branch 'main' into dev-reimplement-http-connector
Browse files Browse the repository at this point in the history
  • Loading branch information
herrfeder authored Mar 26, 2024
2 parents e9948e3 + a326605 commit 9d414c1
Show file tree
Hide file tree
Showing 35 changed files with 2,610 additions and 553 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
python-version: ["3.10"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
Expand All @@ -177,8 +177,9 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build images
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
push: true # Will only build if this is not here
build-args: |
LOGPREP_VERSION=dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
python-version: ["3.10"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-latest-dev-release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
if: github.event.pull_request.merged == true

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Initialize Python
uses: actions/setup-python@v1
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
Expand All @@ -54,7 +54,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and Push Docker Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
push: true # Will only build if this is not here
build-args: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
name: Build Logprep
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Initialize Python
uses: actions/setup-python@v1
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
needs: publish-latest-release-to-pypi
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
Expand All @@ -68,7 +68,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and Push Docker Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
push: true # Will only build if this is not here
build-args: |
Expand Down
1 change: 1 addition & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ python:
- method: pip
path: .
extra_requirements:
- dev
- doc
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,27 @@

## next release
### Breaking

### Features

* retrieve oauth token automatically from different oauth endpoints by introducing an additional file to
define the credentials for every configuration source

#### Improvements
### Bugfix

## v10.0.4
### Improvements

* refactor logprep build process and requirements management

### Bugfix

* fix `generic_adder` not creating new field from type `list`

## v10.0.3
### Bugfix
* fix loading of configuration inside the `AutoRuleCorpusTester` for `logprep test integration`
* fix auto rule tester (`test unit`), which was broken after adding support for multiple configuration files and resolving paths in configuration files
* fix auto rule tester (`test unit`), which was broken after adding support for multiple configuration files and resolving paths in configuration files

## v10.0.2
### Bugfix
Expand Down
Loading

0 comments on commit 9d414c1

Please sign in to comment.