Skip to content

Commit

Permalink
Merge branch 'ershi/asv-force-checkout' into 'main'
Browse files Browse the repository at this point in the history
Add -f option to git checkout in ASV job

See merge request omniverse/warp!986
  • Loading branch information
shi-eric committed Jan 15, 2025
2 parents e0331ac + b23682b commit 6bb8ea4
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ linux-x86_64 asv:
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
changes:
- .gitlab.yml
- .gitlab-ci.yml
- benchmarks/**/*
- warp/**/*
- pyproject.toml
Expand All @@ -507,8 +507,9 @@ linux-x86_64 asv:
- export GIT_LFS_SKIP_SMUDGE=1
- git config --global --add safe.directory '*'
- git fetch origin main
- git checkout main
- git checkout $CI_COMMIT_SHA
# Make sure the main branch can be checked out by asv
- git checkout -f main
- git checkout -f $CI_COMMIT_SHA
- echo -e "\\e[0Ksection_end:`date +%s`:install_dependencies\\r\\e[0K"
script:
- cd benchmarks
Expand Down

0 comments on commit 6bb8ea4

Please sign in to comment.