Skip to content

Commit

Permalink
Run CI on PR merge on release branches (valkey-io#2475)
Browse files Browse the repository at this point in the history
* fix CI

Signed-off-by: Yury-Fridlyand <[email protected]>

* fix CI

Signed-off-by: Yury-Fridlyand <[email protected]>

---------

Signed-off-by: Yury-Fridlyand <[email protected]>
  • Loading branch information
Yury-Fridlyand authored and avifenesh committed Oct 21, 2024
1 parent 7c32dd7 commit b9c19fb
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 45 deletions.
22 changes: 12 additions & 10 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@ name: "CodeQL"
on:
push:
branches:
- "main"
- "v.?[0-9]+.[0-9]+.[0-9]+"
- "v.?[0-9]+.[0-9]+"
- "v?[0-9]+.[0-9]+.[0-9]+"
- "v?[0-9]+.[0-9]+"
- "main"
- "v.?[0-9]+.[0-9]+.[0-9]+"
- "v.?[0-9]+.[0-9]+"
- "v?[0-9]+.[0-9]+.[0-9]+"
- "v?[0-9]+.[0-9]+"
- release-*
pull_request:
branches:
- "main"
- "v.?[0-9]+.[0-9]+.[0-9]+"
- "v.?[0-9]+.[0-9]+"
- "v?[0-9]+.[0-9]+.[0-9]+"
- "v?[0-9]+.[0-9]+"
- "main"
- "v.?[0-9]+.[0-9]+.[0-9]+"
- "v.?[0-9]+.[0-9]+"
- "v?[0-9]+.[0-9]+.[0-9]+"
- "v?[0-9]+.[0-9]+"
- release-*
schedule:
- cron: "37 18 * * 6"

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: C# tests

on:
push:
branches: ["main"]
branches:
- main
- release-*
- v*
paths:
- csharp/**
- glide-core/src/**
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: Go CI

on:
push:
branches: [ "main" ]
branches:
- main
- release-*
- v*
paths:
- glide-core/src/**
- submodules/**
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: Java CI

on:
push:
branches: ["main"]
branches:
- main
- release-*
- v*
paths:
- glide-core/src/**
- submodules/**
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/lint-ts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: lint-ts

on:
push:
branches: ["main"]
branches:
- main
- release-*
- v*
paths:
- benchmarks/node/**
- node/**
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: Node

on:
push:
branches: ["main"]
branches:
- main
- release-*
- v*
paths:
- glide-core/src/**
- submodules/**
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: Python tests

on:
push:
branches: ["main"]
branches:
- main
- release-*
- v*
paths:
- python/**
- glide-core/src/**
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ name: Rust tests

on:
push:
branches: [main]
branches:
- main
- release-*
- v*
paths:
- logger_core/**
- glide-core/**
Expand Down
59 changes: 31 additions & 28 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
name: Semgrep

on:
# Scan changed files in PRs (diff-aware scanning):
pull_request: {}
# Scan on-demand through GitHub Actions interface:
workflow_dispatch:
inputs:
branch:
description: 'The branch to run against the semgrep tool'
required: true
push:
branches: ["main"]
# Schedule the CI job (this method uses cron syntax):
schedule:
- cron: '0 8 * * *' # Sets Semgrep to scan every day at 08:00 UTC.
# Scan changed files in PRs (diff-aware scanning):
pull_request: {}
# Scan on-demand through GitHub Actions interface:
workflow_dispatch:
inputs:
branch:
description: "The branch to run against the semgrep tool"
required: true
push:
branches:
- main
- release-*
- v*
# Schedule the CI job (this method uses cron syntax):
schedule:
- cron: "0 8 * * *" # Sets Semgrep to scan every day at 08:00 UTC.

jobs:
semgrep:
# User definable name of this GitHub Actions job.
name: semgrep/ci
# If you are self-hosting, change the following `runs-on` value:
runs-on: ubuntu-latest
semgrep:
# User definable name of this GitHub Actions job.
name: semgrep/ci
# If you are self-hosting, change the following `runs-on` value:
runs-on: ubuntu-latest

container:
# A Docker image with Semgrep installed. Do not change this.
image: semgrep/semgrep
container:
# A Docker image with Semgrep installed. Do not change this.
image: semgrep/semgrep

# Skip any PR created by dependabot to avoid permission issues:
if: (github.actor != 'dependabot[bot]')
# Skip any PR created by dependabot to avoid permission issues:
if: (github.actor != 'dependabot[bot]')

steps:
# Fetch project source with GitHub Actions Checkout.
- uses: actions/checkout@v3
# Run the "semgrep ci" command on the command line of the docker image.
- run: semgrep ci --config auto --no-suppress-errors --exclude-rule generic.secrets.security.detected-private-key.detected-private-key
steps:
# Fetch project source with GitHub Actions Checkout.
- uses: actions/checkout@v3
# Run the "semgrep ci" command on the command line of the docker image.
- run: semgrep ci --config auto --no-suppress-errors --exclude-rule generic.secrets.security.detected-private-key.detected-private-key

0 comments on commit b9c19fb

Please sign in to comment.