From 11c53665839be08cfe582fba4b88320a2352ac6d Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 11:28:08 +0900 Subject: [PATCH 01/11] Run only on node 13 --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b81206e7..1314def5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,8 @@ jobs: strategy: matrix: os: [ubuntu-latest] - node: [10, 12, 13] + # node: [10, 12, 13] + node: [13] steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 From 22e48e4db421e5781c0d018ad4140b558e6c0d22 Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 12:40:09 +0900 Subject: [PATCH 02/11] Remove shebang --- integration-tests/lockfile/lockfile.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/integration-tests/lockfile/lockfile.sh b/integration-tests/lockfile/lockfile.sh index b69dca6b..f532c2f6 100755 --- a/integration-tests/lockfile/lockfile.sh +++ b/integration-tests/lockfile/lockfile.sh @@ -1,5 +1,3 @@ -#!/usr/bin/env bash - # make sure errors stop the script set -e From cef5e6d723d401e9f7b265559480a915e3b40a12 Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 12:44:51 +0900 Subject: [PATCH 03/11] Temporarily run only lockfile tests --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1314def5..95939614 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,4 +17,5 @@ jobs: - run: yarn install - run: git config --global user.email "patch-package@test.com" - run: git config --global user.name "patch-package" - - run: yarn run test + # - run: yarn run test + - run: yarn run test --verbose integration-tests/lockfile From ec3148c737cf6819b50fe283fa0b13d2defe93ae Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 12:47:14 +0900 Subject: [PATCH 04/11] debug print --- integration-tests/lockfile/lockfile.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-tests/lockfile/lockfile.sh b/integration-tests/lockfile/lockfile.sh index f532c2f6..1c2bfc08 100755 --- a/integration-tests/lockfile/lockfile.sh +++ b/integration-tests/lockfile/lockfile.sh @@ -3,9 +3,11 @@ set -e echo "add patch-package" npm i $1 +set -x alias patch-package=./node_modules/.bin/patch-package testLockFile() { + set -x echo "Version test $1" npm i --lockfile-version $1 From 50e589be2d6537a9d52f3046b83d7f4ef42c1780 Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 12:50:48 +0900 Subject: [PATCH 05/11] Revert order v3/v2/v1 --- integration-tests/lockfile/lockfile.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/lockfile/lockfile.sh b/integration-tests/lockfile/lockfile.sh index 1c2bfc08..f13d9213 100755 --- a/integration-tests/lockfile/lockfile.sh +++ b/integration-tests/lockfile/lockfile.sh @@ -24,11 +24,11 @@ testLockFile() { test -f patches/left-pad+1.3.0.patch || exit 1 } -echo "test lockfile v1" -testLockFile 1 +echo "test lockfile v3" +testLockFile 3 echo "test lockfile v2" testLockFile 2 -echo "test lockfile v3" -testLockFile 3 +echo "test lockfile v1" +testLockFile 1 From e98bce251512e97bff209da39d57af8540be9dff Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 12:54:43 +0900 Subject: [PATCH 06/11] Install left-pad@1.3.0 --- integration-tests/lockfile/lockfile.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/integration-tests/lockfile/lockfile.sh b/integration-tests/lockfile/lockfile.sh index f13d9213..28c65a4a 100755 --- a/integration-tests/lockfile/lockfile.sh +++ b/integration-tests/lockfile/lockfile.sh @@ -6,6 +6,9 @@ npm i $1 set -x alias patch-package=./node_modules/.bin/patch-package +echo "Add left-pad" +npm i left-pad@1.3.0 + testLockFile() { set -x echo "Version test $1" From acd0c84d2b1d800a2e3f09323b2a4edb939fccb7 Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:03:22 +0900 Subject: [PATCH 07/11] Add: apt install libavahi-compat-libdnssd-dev --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 95939614..e2d53f82 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,7 @@ jobs: - uses: actions/setup-node@v1 with: node-version: ${{ matrix.node }} + - run: sudo apt install libavahi-compat-libdnssd-dev - run: yarn install - run: git config --global user.email "patch-package@test.com" - run: git config --global user.name "patch-package" From a72611367390bca39a1c9a834f618047f27cd011 Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:18:48 +0900 Subject: [PATCH 08/11] run on node 10, 12, 13 --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2d53f82..5c597e42 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,8 +7,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - # node: [10, 12, 13] - node: [13] + node: [10, 12, 13] steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 From 26e6106aa6335575f44c67cf3b4225a52edca4a7 Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:24:13 +0900 Subject: [PATCH 09/11] run on node 14 --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5c597e42..5237a575 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,8 @@ jobs: strategy: matrix: os: [ubuntu-latest] - node: [10, 12, 13] + # node: [10, 12, 13] + node: [14] steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 From 757e71662e0e681347bdacf9e7bc2a8d2bed2529 Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:45:32 +0900 Subject: [PATCH 10/11] Remove test for lockfile v1 --- integration-tests/lockfile/lockfile.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/integration-tests/lockfile/lockfile.sh b/integration-tests/lockfile/lockfile.sh index 28c65a4a..b046e45e 100755 --- a/integration-tests/lockfile/lockfile.sh +++ b/integration-tests/lockfile/lockfile.sh @@ -27,11 +27,8 @@ testLockFile() { test -f patches/left-pad+1.3.0.patch || exit 1 } -echo "test lockfile v3" -testLockFile 3 - echo "test lockfile v2" testLockFile 2 -echo "test lockfile v1" -testLockFile 1 +echo "test lockfile v3" +testLockFile 3 From 8101504ae91f25da2dfe186fcfdceeb114af8c1d Mon Sep 17 00:00:00 2001 From: rokiyama <57606749+rokiyama@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:47:39 +0900 Subject: [PATCH 11/11] Cleanup test code --- .github/workflows/main.yml | 7 ++----- integration-tests/lockfile/lockfile.sh | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5237a575..b81206e7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,16 +7,13 @@ jobs: strategy: matrix: os: [ubuntu-latest] - # node: [10, 12, 13] - node: [14] + node: [10, 12, 13] steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 with: node-version: ${{ matrix.node }} - - run: sudo apt install libavahi-compat-libdnssd-dev - run: yarn install - run: git config --global user.email "patch-package@test.com" - run: git config --global user.name "patch-package" - # - run: yarn run test - - run: yarn run test --verbose integration-tests/lockfile + - run: yarn run test diff --git a/integration-tests/lockfile/lockfile.sh b/integration-tests/lockfile/lockfile.sh index b046e45e..e7872269 100755 --- a/integration-tests/lockfile/lockfile.sh +++ b/integration-tests/lockfile/lockfile.sh @@ -3,14 +3,12 @@ set -e echo "add patch-package" npm i $1 -set -x alias patch-package=./node_modules/.bin/patch-package echo "Add left-pad" npm i left-pad@1.3.0 testLockFile() { - set -x echo "Version test $1" npm i --lockfile-version $1