From 579d8dbfb4c7febf7eb8dbdaffe0e881a9097faf Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Wed, 18 Dec 2024 12:02:37 -0800 Subject: [PATCH] Fix pre-commit issues with layout files, fix do with devcontainer Signed-off-by: Derek Hower --- arch/csr/Zihpm/mhpmcounterNh.layout | 4 ++-- arch/csr/Zihpm/mhpmevent10.yaml | 4 +++- arch/csr/Zihpm/mhpmevent11.yaml | 4 +++- arch/csr/Zihpm/mhpmevent12.yaml | 4 +++- arch/csr/Zihpm/mhpmevent13.yaml | 4 +++- arch/csr/Zihpm/mhpmevent14.yaml | 4 +++- arch/csr/Zihpm/mhpmevent15.yaml | 4 +++- arch/csr/Zihpm/mhpmevent16.yaml | 4 +++- arch/csr/Zihpm/mhpmevent17.yaml | 4 +++- arch/csr/Zihpm/mhpmevent18.yaml | 4 +++- arch/csr/Zihpm/mhpmevent19.yaml | 4 +++- arch/csr/Zihpm/mhpmevent20.yaml | 4 +++- arch/csr/Zihpm/mhpmevent21.yaml | 4 +++- arch/csr/Zihpm/mhpmevent22.yaml | 4 +++- arch/csr/Zihpm/mhpmevent23.yaml | 4 +++- arch/csr/Zihpm/mhpmevent24.yaml | 4 +++- arch/csr/Zihpm/mhpmevent25.yaml | 4 +++- arch/csr/Zihpm/mhpmevent26.yaml | 4 +++- arch/csr/Zihpm/mhpmevent27.yaml | 4 +++- arch/csr/Zihpm/mhpmevent28.yaml | 4 +++- arch/csr/Zihpm/mhpmevent29.yaml | 4 +++- arch/csr/Zihpm/mhpmevent3.yaml | 4 +++- arch/csr/Zihpm/mhpmevent30.yaml | 4 +++- arch/csr/Zihpm/mhpmevent31.yaml | 4 +++- arch/csr/Zihpm/mhpmevent4.yaml | 4 +++- arch/csr/Zihpm/mhpmevent5.yaml | 4 +++- arch/csr/Zihpm/mhpmevent6.yaml | 4 +++- arch/csr/Zihpm/mhpmevent7.yaml | 4 +++- arch/csr/Zihpm/mhpmevent8.yaml | 4 +++- arch/csr/Zihpm/mhpmevent9.yaml | 4 +++- arch/csr/Zihpm/mhpmeventN.layout | 1 - do | 15 +++++++-------- 32 files changed, 96 insertions(+), 40 deletions(-) diff --git a/arch/csr/Zihpm/mhpmcounterNh.layout b/arch/csr/Zihpm/mhpmcounterNh.layout index 4c9c42f16..c022581fc 100644 --- a/arch/csr/Zihpm/mhpmcounterNh.layout +++ b/arch/csr/Zihpm/mhpmcounterNh.layout @@ -19,8 +19,8 @@ fields: alias: mhpmcounter.COUNT<%= hpm_num %>[63:32] description: | Upper bits of counter. - type(): 'return (HPM_COUNTER_EN[<%= hpm_num %>]) ? CsrFieldType::RWH : CsrFieldType::RO;' - reset_value(): 'return (HPM_COUNTER_EN[<%= hpm_num %>]) ? UNDEFINED_LEGAL : 0;' + type(): "return (HPM_COUNTER_EN[<%= hpm_num %>]) ? CsrFieldType::RWH : CsrFieldType::RO;" + reset_value(): "return (HPM_COUNTER_EN[<%= hpm_num %>]) ? UNDEFINED_LEGAL : 0;" sw_read(): | if (HPM_COUNTER_EN[<%= hpm_num %>]) { return read_hpm_counter(<%= hpm_num %>)[63:32]; diff --git a/arch/csr/Zihpm/mhpmevent10.yaml b/arch/csr/Zihpm/mhpmevent10.yaml index 5c5aa0319..f14b48041 100644 --- a/arch/csr/Zihpm/mhpmevent10.yaml +++ b/arch/csr/Zihpm/mhpmevent10.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent11.yaml b/arch/csr/Zihpm/mhpmevent11.yaml index ab7ef79ba..9790ec9a4 100644 --- a/arch/csr/Zihpm/mhpmevent11.yaml +++ b/arch/csr/Zihpm/mhpmevent11.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent12.yaml b/arch/csr/Zihpm/mhpmevent12.yaml index d9723cf65..a7b27c502 100644 --- a/arch/csr/Zihpm/mhpmevent12.yaml +++ b/arch/csr/Zihpm/mhpmevent12.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent13.yaml b/arch/csr/Zihpm/mhpmevent13.yaml index abbad38d8..36386e2c6 100644 --- a/arch/csr/Zihpm/mhpmevent13.yaml +++ b/arch/csr/Zihpm/mhpmevent13.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent14.yaml b/arch/csr/Zihpm/mhpmevent14.yaml index 13e26ba6b..445ee339e 100644 --- a/arch/csr/Zihpm/mhpmevent14.yaml +++ b/arch/csr/Zihpm/mhpmevent14.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent15.yaml b/arch/csr/Zihpm/mhpmevent15.yaml index aac17d83c..188feeeec 100644 --- a/arch/csr/Zihpm/mhpmevent15.yaml +++ b/arch/csr/Zihpm/mhpmevent15.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent16.yaml b/arch/csr/Zihpm/mhpmevent16.yaml index bae1d8402..52142b22c 100644 --- a/arch/csr/Zihpm/mhpmevent16.yaml +++ b/arch/csr/Zihpm/mhpmevent16.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent17.yaml b/arch/csr/Zihpm/mhpmevent17.yaml index 402981d78..8720f4174 100644 --- a/arch/csr/Zihpm/mhpmevent17.yaml +++ b/arch/csr/Zihpm/mhpmevent17.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent18.yaml b/arch/csr/Zihpm/mhpmevent18.yaml index 102925471..5933dbcb4 100644 --- a/arch/csr/Zihpm/mhpmevent18.yaml +++ b/arch/csr/Zihpm/mhpmevent18.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent19.yaml b/arch/csr/Zihpm/mhpmevent19.yaml index 68bbb178f..19eb51d7d 100644 --- a/arch/csr/Zihpm/mhpmevent19.yaml +++ b/arch/csr/Zihpm/mhpmevent19.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent20.yaml b/arch/csr/Zihpm/mhpmevent20.yaml index 718d2aaab..b2b88393e 100644 --- a/arch/csr/Zihpm/mhpmevent20.yaml +++ b/arch/csr/Zihpm/mhpmevent20.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent21.yaml b/arch/csr/Zihpm/mhpmevent21.yaml index bbe47e8fb..2a90c6ae6 100644 --- a/arch/csr/Zihpm/mhpmevent21.yaml +++ b/arch/csr/Zihpm/mhpmevent21.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent22.yaml b/arch/csr/Zihpm/mhpmevent22.yaml index 9109a7e26..796ecc6ad 100644 --- a/arch/csr/Zihpm/mhpmevent22.yaml +++ b/arch/csr/Zihpm/mhpmevent22.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent23.yaml b/arch/csr/Zihpm/mhpmevent23.yaml index f07456c81..56e1ee323 100644 --- a/arch/csr/Zihpm/mhpmevent23.yaml +++ b/arch/csr/Zihpm/mhpmevent23.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent24.yaml b/arch/csr/Zihpm/mhpmevent24.yaml index 63bbfe972..3a1e4449f 100644 --- a/arch/csr/Zihpm/mhpmevent24.yaml +++ b/arch/csr/Zihpm/mhpmevent24.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent25.yaml b/arch/csr/Zihpm/mhpmevent25.yaml index e6451315d..a6c9d078f 100644 --- a/arch/csr/Zihpm/mhpmevent25.yaml +++ b/arch/csr/Zihpm/mhpmevent25.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent26.yaml b/arch/csr/Zihpm/mhpmevent26.yaml index 952d80903..5d4056b1c 100644 --- a/arch/csr/Zihpm/mhpmevent26.yaml +++ b/arch/csr/Zihpm/mhpmevent26.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent27.yaml b/arch/csr/Zihpm/mhpmevent27.yaml index 48036d557..7d2a63697 100644 --- a/arch/csr/Zihpm/mhpmevent27.yaml +++ b/arch/csr/Zihpm/mhpmevent27.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent28.yaml b/arch/csr/Zihpm/mhpmevent28.yaml index 39fe839ad..638b11e81 100644 --- a/arch/csr/Zihpm/mhpmevent28.yaml +++ b/arch/csr/Zihpm/mhpmevent28.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent29.yaml b/arch/csr/Zihpm/mhpmevent29.yaml index add075a81..4f5383b6a 100644 --- a/arch/csr/Zihpm/mhpmevent29.yaml +++ b/arch/csr/Zihpm/mhpmevent29.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent3.yaml b/arch/csr/Zihpm/mhpmevent3.yaml index dc92768d8..70209941c 100644 --- a/arch/csr/Zihpm/mhpmevent3.yaml +++ b/arch/csr/Zihpm/mhpmevent3.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent30.yaml b/arch/csr/Zihpm/mhpmevent30.yaml index f7a09d917..2c92797bf 100644 --- a/arch/csr/Zihpm/mhpmevent30.yaml +++ b/arch/csr/Zihpm/mhpmevent30.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent31.yaml b/arch/csr/Zihpm/mhpmevent31.yaml index aa66ff87c..8c81f6f09 100644 --- a/arch/csr/Zihpm/mhpmevent31.yaml +++ b/arch/csr/Zihpm/mhpmevent31.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent4.yaml b/arch/csr/Zihpm/mhpmevent4.yaml index d4880a960..90c8fcbfa 100644 --- a/arch/csr/Zihpm/mhpmevent4.yaml +++ b/arch/csr/Zihpm/mhpmevent4.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent5.yaml b/arch/csr/Zihpm/mhpmevent5.yaml index d373fe3bf..d2efff583 100644 --- a/arch/csr/Zihpm/mhpmevent5.yaml +++ b/arch/csr/Zihpm/mhpmevent5.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent6.yaml b/arch/csr/Zihpm/mhpmevent6.yaml index 0ab1ee66b..6ec9942fb 100644 --- a/arch/csr/Zihpm/mhpmevent6.yaml +++ b/arch/csr/Zihpm/mhpmevent6.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent7.yaml b/arch/csr/Zihpm/mhpmevent7.yaml index 15c5c3ca5..473c67bae 100644 --- a/arch/csr/Zihpm/mhpmevent7.yaml +++ b/arch/csr/Zihpm/mhpmevent7.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent8.yaml b/arch/csr/Zihpm/mhpmevent8.yaml index cc9d7e4f8..01b7ead79 100644 --- a/arch/csr/Zihpm/mhpmevent8.yaml +++ b/arch/csr/Zihpm/mhpmevent8.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmevent9.yaml b/arch/csr/Zihpm/mhpmevent9.yaml index b0deeed6e..b4b493328 100644 --- a/arch/csr/Zihpm/mhpmevent9.yaml +++ b/arch/csr/Zihpm/mhpmevent9.yaml @@ -1,4 +1,6 @@ -# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout# yaml-language-server: $schema=../../../schemas/csr_schema.json +# yaml-language-server: $schema=../../../schemas/csr_schema.json + +# WARNING: This file is auto-generated from arch/csr/Zihpm/mhpmeventN.layout $schema: csr_schema.json# kind: csr diff --git a/arch/csr/Zihpm/mhpmeventN.layout b/arch/csr/Zihpm/mhpmeventN.layout index 4324c11a1..54eebdf87 100644 --- a/arch/csr/Zihpm/mhpmeventN.layout +++ b/arch/csr/Zihpm/mhpmeventN.layout @@ -1,4 +1,3 @@ - # yaml-language-server: $schema=../../../schemas/csr_schema.json <%- raise "'hpm_num' must be defined" if hpm_num.nil? -%> diff --git a/do b/do index 57ae6f102..8d18a10eb 100755 --- a/do +++ b/do @@ -1,15 +1,14 @@ #!/bin/bash ROOT=$(dirname $(realpath $BASH_SOURCE[0])) -if [ -v DEVCONTAINER_ENV ]; then - BUNDLE=bundle -else - source $ROOT/bin/setup -fi if [ "$1" == "clean" ]; then ${ROOT}/bin/clean -else - # really long way of invoking rake, but renamed to 'do' - $BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@ + exit $? fi + +source $ROOT/bin/setup + + +# really long way of invoking rake, but renamed to 'do' +$BUNDLE exec --gemfile $ROOT/Gemfile ruby -r rake -e "Rake.application.init('do');Rake.application.load_rakefile;Rake.application.top_level" -- $@