From 3c50c5a84542c978c5882a830da8d51c8e3722b4 Mon Sep 17 00:00:00 2001
From: Callum Waters <cmwaters19@gmail.com>
Date: Wed, 28 Apr 2021 12:22:18 +0200
Subject: [PATCH] github actions: fix e2e-nightly-master.yml (#6398)

---
 .github/workflows/e2e-nightly-master.yml  | 7 +++----
 .github/workflows/{lint.yaml => lint.yml} | 0
 .github/workflows/linter.yml              | 1 +
 test/e2e/generator/main.go                | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename .github/workflows/{lint.yaml => lint.yml} (100%)

diff --git a/.github/workflows/e2e-nightly-master.yml b/.github/workflows/e2e-nightly-master.yml
index a498a72bf..333213792 100644
--- a/.github/workflows/e2e-nightly-master.yml
+++ b/.github/workflows/e2e-nightly-master.yml
@@ -35,12 +35,11 @@ jobs:
       - name: Generate testnets
         working-directory: test/e2e
         # When changing -g, also change the matrix groups above
-        run: ./build/generator -g 4 -d networks/nightly/{{ matrix.p2p }} -p {{ matrix.p2p }} 
+        run: ./build/generator -g 4 -d networks/nightly/${{ matrix.p2p }} -p ${{ matrix.p2p }} 
 
-      - name: Run {{ matrix.p2p }} p2p testnets in group ${{ matrix.group }}
+      - name: Run ${{ matrix.p2p }} p2p testnets in group ${{ matrix.group }}
         working-directory: test/e2e
-        run: ./run-multiple.sh networks/nightly/{{ matrix.p2p }}/*-group${{ matrix.group
-        }}-*.toml
+        run: ./run-multiple.sh networks/nightly/${{ matrix.p2p }}/*-group${{ matrix.group }}-*.toml
 
   e2e-nightly-fail-2:
     needs: e2e-nightly-test-2
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yml
similarity index 100%
rename from .github/workflows/lint.yaml
rename to .github/workflows/lint.yml
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index c4098557e..cc1a269e2 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -11,6 +11,7 @@ on:
     branches: [master]
     paths:
       - "**.md"
+      - "**.yml"
 
 jobs:
   build:
diff --git a/test/e2e/generator/main.go b/test/e2e/generator/main.go
index a965fb720..91080c063 100644
--- a/test/e2e/generator/main.go
+++ b/test/e2e/generator/main.go
@@ -50,11 +50,11 @@ func NewCLI() *CLI {
 				return err
 			}
 			var opts Options
-			switch p2pMode {
-			case "new", "legacy", "split", "mixed":
-				opts = Options{P2P: P2PMode(p2pMode)}
+			switch mode := P2PMode(p2pMode); mode {
+			case NewP2PMode, LegacyP2PMode, HybridP2PMode, MixedP2PMode:
+				opts = Options{P2P: mode}
 			default:
-				return fmt.Errorf("p2p mode must be either new, legacy, split or mixed got %s", p2pMode)
+				return fmt.Errorf("p2p mode must be either new, legacy, hybrid or mixed got %s", p2pMode)
 			}
 
 			return cli.generate(dir, groups, opts)