Skip to content

Commit

Permalink
Merge branch 'main' into delta-api
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jan 10, 2025
2 parents b429bd4 + b57db71 commit 195225d
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 113 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-debug-docker-with-chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- "**/*.rs"
- "**/*.toml"
- "**/*.lock"
- ".github/workflows/build-docker-with-chef.yaml"
- ".github/workflows/build-debug-docker-with-chef.yaml"
- "Dockerfile"
tags:
- unleash-edge-v[0-9]+.*
Expand All @@ -21,7 +21,7 @@ on:
- "**/*.rs"
- "**/*.toml"
- "**/*.lock"
- ".github/workflows/build-docker-with-chef.yaml"
- ".github/workflows/build-debug-docker-with-chef.yaml"
- "Dockerfile"
workflow_dispatch:

Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/clippy.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
---
name: Clippy

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
push:
branches:
- main
paths:
- '**.rs'
- '**.toml'
- "**.rs"
- "**.toml"
pull_request:
branches:
- main
paths:
- '**.rs'
- '**.toml'
- "**.rs"
- "**.toml"

jobs:
clippy:
Expand All @@ -37,4 +41,3 @@ jobs:
- name: Run rust-clippy
run: |
cargo clippy --all-features -- -D warnings
1 change: 1 addition & 0 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ jobs:
fail-on-severity: moderate
deny-licenses: GPL-1.0, GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0, AGPL-3.0
comment-summary-in-pr: always
warn-only: true
8 changes: 6 additions & 2 deletions .github/workflows/loadtesting.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Load testing

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
workflow_dispatch:
jobs:
Expand All @@ -16,7 +20,7 @@ jobs:
- 3063
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v4
- name: Run K6 client/features benchmark
uses: grafana/[email protected]
with:
Expand All @@ -28,4 +32,4 @@ jobs:
with:
filename: benchmarks/proxyendpoint.js
env:
TOKEN: ${{ secrets.UNLEASH_FRONTEND_SECRET }}
TOKEN: ${{ secrets.UNLEASH_FRONTEND_SECRET }}
99 changes: 0 additions & 99 deletions .github/workflows/release_manual_trigger.yaml

This file was deleted.

6 changes: 5 additions & 1 deletion .github/workflows/semver-check.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Semver check

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
push:
branches:
Expand All @@ -24,4 +28,4 @@ jobs:
- name: Rust cache
uses: Swatinem/rust-cache@v2
- name: Check semver
uses: obi1kenobi/cargo-semver-checks-action@v2
uses: obi1kenobi/cargo-semver-checks-action@v2
8 changes: 4 additions & 4 deletions .github/workflows/test-with-coverage.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
---
name: Run tests with coverage on code

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

on:
push:
branches:
Expand All @@ -11,10 +15,6 @@ on:
pull_request:
branches:
- main
paths:
- "**.rs"
- "**.toml"

jobs:
tarpaulin:
runs-on: ubuntu-latest
Expand Down

0 comments on commit 195225d

Please sign in to comment.