Skip to content

Commit 3b74e87

Browse files
Merge pull request #77 from OctoPrint/workflow-maintenance
Workflow maintenance
2 parents 5718e86 + ba68446 commit 3b74e87

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ jobs:
1919
- uses: dorny/[email protected]
2020
id: filter
2121
with:
22-
filters: '.github/filters.yml'
22+
filters: |
23+
main_image_files:
24+
- 'Dockerfile'
25+
- 'root/**'
26+
minimal_image_files:
27+
- 'minimal/**'
2328
2429
build:
2530
runs-on: ubuntu-latest
2631
needs: filters
27-
if: needs.filters.outputs.found_main_changes
32+
if: ${{ needs.filters.outputs.found_main_changes }}
2833

2934
steps:
3035
- uses: actions/checkout@v2

.github/workflows/octoprint-release.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,17 @@ jobs:
2222
if: ${{ github.event_name == 'push'}}
2323
id: filter
2424
with:
25-
filters: '.github/filters.yml'
25+
filters: |
26+
main_image_files:
27+
- 'Dockerfile'
28+
- 'root/**'
29+
minimal_image_files:
30+
- 'minimal/**'
2631
2732
release:
2833
runs-on: ubuntu-latest
2934
needs: filters
30-
if: github.event_name == 'repository_dispatch' || needs.filters.outputs.found_main_changes == 'true'
35+
if: ${{ github.event_name == 'repository_dispatch' || needs.filters.outputs.found_main_changes == 'true' }}
3136
strategy:
3237
matrix:
3338
tags: ['latest','%X%', '%X.Y%', '%X.Y.Z%']
@@ -70,7 +75,7 @@ jobs:
7075
id: build_deploy
7176
#if matrix tag is latest AND tag_name is NOT equal to latest-octoprint don't build
7277
# this allows rebuilds of older versions without changing 'latest' to an old release
73-
if: !(env.tag_name == 'latest' && ( steps.latest-octprint.outputs.release != env.tag_name ))
78+
if: ${{!(env.tag_name == 'latest' && ( steps.latest-octprint.outputs.release != env.tag_name ))}}
7479
run: |
7580
docker buildx build --push \
7681
--platform linux/arm64,linux/amd64,linux/arm/v7 \

0 commit comments

Comments
 (0)