Fix stylish-haskell GHA

IntersectMBO · Dec 2, 2023 · 9243464 · 9243464
1 parent 9907d36
commit 9243464
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/.github/workflows/stylish-haskell.yml → .github/workflows/check-stylish-haskell.yml b/.github/workflows/stylish-haskell.yml → .github/workflows/check-stylish-haskell.yml
@@ -1,8 +1,8 @@
 name: Check Stylish Haskell
 
 on:
-  pull_request: # Required for workflows to be able to be approved from forks
   merge_group:
+  pull_request:
 
 # When pushing branches (and/or updating PRs), we do want to cancel previous
 # build runs. We assume they are stale now; and do not want to spend CI time and
@@ -19,7 +19,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  check-stylish-haskell:
     runs-on: ubuntu-latest
 
     strategy:
@@ -32,16 +32,7 @@ jobs:
       STYLISH_HASKELL_VERSION: "0.14.4.0"
 
       STYLISH_HASKELL_PATHS: >
-        cardano-testnet
-        cardano-git-rev
-        cardano-node
-        cardano-node-chairman
-        cardano-tracer
-        trace-resources
-        cardano-node-capi
-        trace-dispatcher
-        trace-forward
-        cardano-submit-api
+        cardano-api
 
     steps:
     - name: Download stylish-haskell
@@ -79,7 +70,7 @@ jobs:
         git add .
         git stash
         git fetch origin ${{ github.base_ref }} --unshallow
-        for x in $(git diff --name-only origin/${{ github.base_ref }}..HEAD ${{ env.STYLISH_HASKELL_PATHS }}); do
+        for x in $(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}..HEAD ${{ env.STYLISH_HASKELL_PATHS }}); do
           if [ "${x##*.}" == "hs" ]; then
             if grep -qE '^#' $x; then
               echo "$x contains CPP.  Skipping."

diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/tx.failed.response.golden b/cardano-testnet/test/cardano-testnet-test/files/golden/tx.failed.response.golden
@@ -1 +1 @@
-"transaction submit error ShelleyTxValidationError ShelleyBasedEraBabbage (ApplyTxError [UtxowFailure (UtxoFailure (AlonzoInBabbageUtxoPredFailure (ValueNotConservedUTxO (MaryValue (Coin 0) (MultiAsset (fromList []))) (MaryValue (Coin 300000000000) (MultiAsset (fromList [])))))),UtxowFailure (UtxoFailure (AlonzoInBabbageUtxoPredFailure (BadInputsUTxO (fromList [TxIn (TxId {unTxId = SafeHash \"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\"}) (TxIx 0)]))))])"
+{"contents":{"contents":"ShelleyTxValidationError ShelleyBasedEraBabbage (ApplyTxError [UtxowFailure (UtxoFailure (AlonzoInBabbageUtxoPredFailure (ValueNotConservedUTxO (MaryValue (Coin 0) (MultiAsset (fromList []))) (MaryValue (Coin 300000000000) (MultiAsset (fromList [])))))),UtxowFailure (UtxoFailure (AlonzoInBabbageUtxoPredFailure (BadInputsUTxO (fromList [TxIn (TxId {unTxId = SafeHash \"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\"}) (TxIx 0)]))))])","tag":"TxCmdTxSubmitError"},"tag":"TxSubmitFail"}