summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authormashuptwice <info@mashup-tech.de>2022-08-25 10:56:09 +0200
committermashuptwice <info@mashup-tech.de>2022-08-25 10:56:09 +0200
commit5c253c10a8534879ea002baa7766ba341f1c168b (patch)
treea4bc18491594b36689f86bb030bbccac36496a0e /.github
parenta86668b6b717fb618cc4cc7167e49e3339748417 (diff)
parent69563ed03155eb861f8b8ada1df1325995fab51b (diff)
Merge remote-tracking branch 'upstream/develop' into workflow-ignore-md
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/lv_sim.yml2
-rw-r--r--.github/workflows/main.yml2
2 files changed, 0 insertions, 4 deletions
diff --git a/.github/workflows/lv_sim.yml b/.github/workflows/lv_sim.yml
index 7b02fb1c..c950168c 100644
--- a/.github/workflows/lv_sim.yml
+++ b/.github/workflows/lv_sim.yml
@@ -7,13 +7,11 @@ on:
branches: [ master, develop ]
paths-ignore:
- 'doc/**'
- - 'images/**'
- '**.md'
pull_request:
branches: [ develop ]
paths-ignore:
- 'doc/**'
- - 'images/**'
- '**.md'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0f0686b6..81054bcb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,13 +10,11 @@ on:
branches: [ master, develop ]
paths-ignore:
- 'doc/**'
- - 'images/**'
- '**.md'
pull_request:
branches: [ develop ]
paths-ignore:
- 'doc/**'
- - 'images/**'
- '**.md'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch: