Merge pull request #2107 from sanger/develop

[release] Merge Develop into Master
sanger · Dec 9, 2024 · a4837a2 · a4837a2
2 parents 5b3b2fe + 2fbce2e
commit a4837a2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/.release-version b/.release-version
@@ -1 +1 @@
-3.64.3
+3.65.0
diff --git a/config/pipelines/bespoke_hic.wip.yml → config/pipelines/bespoke_hic.yml b/config/pipelines/bespoke_hic.wip.yml → config/pipelines/bespoke_hic.yml
diff --git a/config/pipelines/hic.wip.yml → config/pipelines/hic.yml b/config/pipelines/hic.wip.yml → config/pipelines/hic.yml
diff --git a/config/purposes/bespoke_hic.wip.yml → config/purposes/bespoke_hic.yml b/config/purposes/bespoke_hic.wip.yml → config/purposes/bespoke_hic.yml
diff --git a/lefthook.yml b/lefthook.yml
@@ -10,7 +10,7 @@ pre-commit:
       run: bundle exec rubocop --display-style-guide --extra-details --force-exclusion --parallel {staged_files} || (echo 'Run `lefthook run fix` to run autocorrect on staged files only'; exit 1)
     eslint:
       glob: 'app/frontend/**/*.{vue,js}'
-      run: yarn lintOnly {staged_files} || (echo 'Run `lefthook run fix` to run autocorrect on staged files only'; exit 1)
+      run: yarn lintOnly --format compact {staged_files} || (echo 'Run `lefthook run fix` to run autocorrect on staged files only'; exit 1)
     prettier:
       run: yarn prettier --check {staged_files} --ignore-unknown
 
@@ -22,7 +22,7 @@ fix:
       run: bundle exec rubocop --display-style-guide --extra-details --auto-correct --force-exclusion {staged_files}
     eslint:
       glob: 'app/frontend/**/*.{vue,js}'
-      run: yarn lintOnly {staged_files} --fix
+      run: yarn lintOnly --format compact {staged_files} --fix
     prettier:
       run: yarn prettier --write {staged_files} --ignore-unknown
 # EXAMPLE USAGE