ci: all node version will try to test on http2

ladjs · May 8, 2022 · 44f8ae0 · 44f8ae0
1 parent 5030b83
commit 44f8ae0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,9 +16,7 @@ jobs:
         - node-version: 12.x
           # test-on-brower: 1
         - node-version: 14.x
-          # test-http2: 1
         - node-version: 16.x
-          # test-http2: 1
     steps:
       - uses: actions/checkout@v2
 
@@ -48,7 +46,7 @@ jobs:
       - name: Test On Node ${{ matrix.node-version }}
         env:
           BROWSER: ${{ matrix.test-on-brower }}
-          HTTP2_TEST: ${{ matrix.test-http2 }}
+          HTTP2_TEST_DISABLED: ${{ matrix.disable-htt2-test }}
           OLD_NODE_TEST: ${{ matrix.test-on-old-node }}
         run: |
           if [ "$OLD_NODE_TEST" = "1" ]; then

diff --git a/Makefile b/Makefile
@@ -14,18 +14,22 @@ test:
 	fi
 
 	@if [ "$(NODE_TEST)" = "1" ] || [ "x$(BROWSER)" = "x" ]; then \
-		echo test on node; \
-		make test-node; \
+    @if [ "$(HTTP2_TEST_DISABLED)" != "1" ]; then \
+		  echo test on node with htt2; \
+      export HTTP2_TEST="1" && make test-node; \
+    fi \
+    echo test on node with http1; \
+    export HTTP2_TEST="" && make test-node; \
 	fi
-	
+
 copy:
 	@if [ "$(OLD_NODE_TEST)" = "1" ]; then \
 		echo test on old node; \
 		cp test/node/fixtures lib/node/test/node -rf; \
 	else \
 		echo test on plain node; \
 	fi
-	
+
 test-node:copy
 	@NODE_ENV=test HTTP2_TEST=$(HTTP2_TEST) ./node_modules/.bin/nyc ./node_modules/.bin/mocha \
 		--require should \