Skip to content

Update workflows to automatically handle all branches with directory checks #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmlrt merged 9 commits into from
Jan 13, 2026
Merged

Update workflows to automatically handle all branches with directory checks #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28278d9
Update elasticsearch workflow to trigger on all PRs except main
jmlrt Jan 13, 2026
0d9ad74
Update elasticsearch workflow push trigger to exclude main branch
jmlrt Jan 13, 2026
c114fb9
Add branches-ignore to pull_request trigger for consistency
jmlrt Jan 13, 2026
cf3b96e
Update kibana and logstash workflows to trigger on all branches excep…
jmlrt Jan 13, 2026
d5b401e
Fix workflows to properly skip PRs targeting main branch
jmlrt Jan 13, 2026
d752b03
Add directory existence check to prevent build failures
jmlrt Jan 13, 2026
8d70765
Simplify workflows by removing redundant job condition
jmlrt Jan 13, 2026
295c231
Remove branches-ignore, rely solely on directory check
jmlrt Jan 13, 2026
846e8b6
Add comments explaining directory check for main branch
jmlrt Jan 13, 2026
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
15 changes: 13 additions & 2 deletions .github/workflows/elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: Elasticsearch Docker Image CI

on:
push:
branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]
pull_request:
branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]

jobs:

Expand All @@ -15,5 +13,18 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# Check if directory exists - needed because main branch doesn't contain Dockerfiles
# (see README.md for branch model documentation)
- name: Check if elasticsearch directory exists
id: check_dir
run: |
if [ ! -d "elasticsearch" ]; then
echo "exists=false" >> $GITHUB_OUTPUT
echo "Directory elasticsearch does not exist, skipping build"
else
echo "exists=true" >> $GITHUB_OUTPUT
fi

- name: Build the Elasticsearch Docker image
if: steps.check_dir.outputs.exists == 'true'
run: docker build elasticsearch
15 changes: 13 additions & 2 deletions .github/workflows/kibana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: Kibana Docker Image CI

on:
push:
branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]
pull_request:
branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]

jobs:

Expand All @@ -15,5 +13,18 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# Check if directory exists - needed because main branch doesn't contain Dockerfiles
# (see README.md for branch model documentation)
- name: Check if kibana directory exists
id: check_dir
run: |
if [ ! -d "kibana" ]; then
echo "exists=false" >> $GITHUB_OUTPUT
echo "Directory kibana does not exist, skipping build"
else
echo "exists=true" >> $GITHUB_OUTPUT
fi

- name: Build the Kibana Docker image
if: steps.check_dir.outputs.exists == 'true'
run: docker build kibana
15 changes: 13 additions & 2 deletions .github/workflows/logstash.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: Logstash Docker Image CI

on:
push:
branches: ["8.17", "8.18", "8.19", "9.0", "9.1"]
pull_request:
branches: ["8.17", "8.18", "8.19", "9.0", "9.1"]

jobs:

Expand All @@ -15,5 +13,18 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

# Check if directory exists - needed because main branch doesn't contain Dockerfiles
# (see README.md for branch model documentation)
- name: Check if logstash directory exists
id: check_dir
run: |
if [ ! -d "logstash" ]; then
echo "exists=false" >> $GITHUB_OUTPUT
echo "Directory logstash does not exist, skipping build"
else
echo "exists=true" >> $GITHUB_OUTPUT
fi

- name: Build the Logstash Docker image
if: steps.check_dir.outputs.exists == 'true'
run: docker build logstash