Skip to content

Commit

Permalink
Fix test trigger on main
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilyBourne committed Dec 14, 2023
1 parent 998b1ce commit e1c7e95
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ci_tools/reusable_ci_jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ setup_env_push:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
before_script:
- set -x
- git log -1 --format=%H | git diff --name-only" > changed_files.txt
- git config --global --add safe.directory $(pwd)
- git log -1 --format=%H | git diff --name-only > changed_files.txt

setup_env_mr:
extends: .setup_env
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
before_script:
- set -x
- ${GIT_DIFF_COMMAND} > changed_files.txt
- git config --global --add safe.directory $(pwd)
- git fetch --no-recurse-submodules origin ${CI_MERGE_REQUEST_DIFF_BASE_SHA}
- git diff --name-only ${CI_MERGE_REQUEST_DIFF_BASE_SHA} > changed_files.txt
Expand Down

0 comments on commit e1c7e95

Please sign in to comment.