Skip to content

Commit

Permalink
backport of commit c833fcc
Browse files Browse the repository at this point in the history
  • Loading branch information
NiniOak committed Aug 23, 2023
1 parent 7c72bba commit c89eb9f
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 2 deletions.
33 changes: 33 additions & 0 deletions .github/scripts/filter_changed_files_go_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/bin/bash

# Get the list of changed files
files_to_check=$(git diff --name-only origin/$GITHUB_BASE_REF)

# Define the directories to check
skipped_directories=("docs/" "ui/" "website/" "grafana/")

# Initialize a variable to track directories outside the skipped ones
other_directories=""
trigger_ci=false

# Loop through the changed files and find directories/files outside the skipped ones
for file_to_check in $files_to_check; do
file_is_skipped=false
for dir in "${skipped_directories[@]}"; do
if [[ "$file_to_check" == "$dir"* ]] || [[ "$file_to_check" == *.md && "$dir" == *"/" ]]; then
file_is_skipped=true
break
fi
done
if [ "$file_is_skipped" = "false" ]; then
other_directories+="$(dirname "$file_to_check")\n"
trigger_ci=true
echo "Non doc file(s) changed - triggered ci: $trigger_ci"
echo -e $other_directories
echo "trigger-ci=$trigger_ci" >>"$GITHUB_OUTPUT"
exit 0 ## if file is outside of the skipped_directory exit script
fi
done

echo "Only doc file(s) changed - triggered ci: $trigger_ci"
echo "trigger-ci=$trigger_ci" >>"$GITHUB_OUTPUT"
18 changes: 17 additions & 1 deletion .github/workflows/go-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,23 @@ env:
GOPRIVATE: github.com/hashicorp # Required for enterprise deps

jobs:
conditional-skip:
runs-on: ubuntu-latest
name: Get files changed and conditionally skip CI
outputs:
trigger-ci: ${{ steps.read-files.outputs.trigger-ci }}
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
with:
fetch-depth: 0
- name: Get changed files
id: read-files
run: ./.github/scripts/filter_changed_files_go_test.sh

setup:
needs: [conditional-skip]
name: Setup
if: needs.conditional-skip.outputs.trigger-ci == 'true'
runs-on: ubuntu-latest
outputs:
compute-small: ${{ steps.setup-outputs.outputs.compute-small }}
Expand Down Expand Up @@ -463,6 +478,7 @@ jobs:

go-tests-success:
needs:
- conditional-skip
- setup
- check-generated-deep-copy
- check-generated-protobuf
Expand All @@ -485,7 +501,7 @@ jobs:
- go-test-32bit
# - go-test-s390x
runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
if: ${{ always() }}
if: always() && needs.conditional-skip.outputs.trigger-ci == 'true'
steps:
- name: evaluate upstream job results
run: |
Expand Down
18 changes: 17 additions & 1 deletion .github/workflows/test-integrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,24 @@ env:
GOPRIVATE: github.com/hashicorp # Required for enterprise deps

jobs:
conditional-skip:
runs-on: ubuntu-latest
name: Get files changed and conditionally skip CI
outputs:
trigger-ci: ${{ steps.read-files.outputs.trigger-ci }}
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
with:
fetch-depth: 0
- name: Get changed files
id: read-files
run: ./.github/scripts/filter_changed_files_go_test.sh

setup:
needs: [conditional-skip]
runs-on: ubuntu-latest
name: Setup
if: needs.conditional-skip.outputs.trigger-ci == 'true'
outputs:
compute-small: ${{ steps.runners.outputs.compute-small }}
compute-medium: ${{ steps.runners.outputs.compute-medium }}
Expand Down Expand Up @@ -462,6 +477,7 @@ jobs:

test-integrations-success:
needs:
- conditional-skip
- setup
- dev-build
- nomad-integration-test
Expand All @@ -470,7 +486,7 @@ jobs:
- envoy-integration-test
- compatibility-integration-test
runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
if: ${{ always() }}
if: always() && needs.conditional-skip.outputs.trigger-ci == 'true'
steps:
- name: evaluate upstream job results
run: |
Expand Down

0 comments on commit c89eb9f

Please sign in to comment.