From 9b6b98a3a31191646984309c0fb0a450ea0342e6 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 24 Feb 2025 21:49:10 +0100 Subject: [PATCH 1/2] Also trigger preview build on deleted files --- .github/workflows/preview-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 04543dd4e..d6d8585ca 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -59,7 +59,7 @@ jobs: tool-cache: false - name: Create Deployment - if: github.event_name == 'push' || (steps.check-files.outputs.any_changed == 'true' && startsWith(github.event_name, 'pull_request')) + if: github.event_name == 'push' || (steps.check-files.outputs.any_modified == 'true' && startsWith(github.event_name, 'pull_request')) uses: actions/github-script@v7 id: deployment env: @@ -126,7 +126,7 @@ jobs: dotnet run --project src/docs-builder -- --strict --path-prefix "${PATH_PREFIX}" - name: Build documentation - if: github.repository != 'elastic/docs-builder' && (steps.deployment.outputs.result || (steps.check-files.outputs.any_changed == 'true' && github.event_name == 'merge_group')) + if: github.repository != 'elastic/docs-builder' && (steps.deployment.outputs.result || (steps.check-files.outputs.any_modified == 'true' && github.event_name == 'merge_group')) uses: elastic/docs-builder@main continue-on-error: ${{ fromJSON(inputs.continue-on-error != '' && inputs.continue-on-error || 'false') }} with: @@ -134,7 +134,7 @@ jobs: strict: ${{ fromJSON(inputs.strict != '' && inputs.strict || 'true') }} - uses: elastic/docs-builder/actions/validate-inbound-local@main - if: ${{ !cancelled() && (steps.deployment.outputs.result || (steps.check-files.outputs.any_changed == 'true' && github.event_name == 'merge_group')) }} + if: ${{ !cancelled() && (steps.deployment.outputs.result || (steps.check-files.outputs.any_modified == 'true' && github.event_name == 'merge_group')) }} - uses: elastic/docs-builder/.github/actions/aws-auth@main if: ${{ !cancelled() && steps.deployment.outputs.result }} From 58ba43a402d8a405b294a7fe55209b7107345971 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 24 Feb 2025 22:09:14 +0100 Subject: [PATCH 2/2] Fix merge conflicts --- .github/workflows/preview-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 782e52e0c..20a145591 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -135,7 +135,7 @@ jobs: - name: 'Validate Inbound Links' uses: elastic/docs-builder/actions/validate-inbound-local@main - if: ${{ !cancelled() && (steps.deployment.outputs.result || (steps.check-files.outputs.any_changed == 'true' && github.event_name == 'merge_group')) }} + if: ${{ !cancelled() && (steps.deployment.outputs.result || (steps.check-files.outputs.any_modified == 'true' && github.event_name == 'merge_group')) }} - uses: elastic/docs-builder/.github/actions/aws-auth@main if: ${{ !cancelled() && steps.deployment.outputs.result }}