From 4aad91dd9896ee46b5869172b1720ae831502e13 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 21 Mar 2020 15:08:03 -0700 Subject: [PATCH 1/8] ci: attempt to get flakey ci working --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 8ead79d..f6cfcfb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,7 @@ environment: install: - ps: Install-Product node $env:nodejs_version + - npm install -g npm@6.4.1 - npm install test_script: From a98874f1a59e407f4fb1beb0db4efa8392da60bb Mon Sep 17 00:00:00 2001 From: Denis Malinochkin Date: Sun, 22 Mar 2020 01:11:27 +0300 Subject: [PATCH 2/8] fix: unescape exclamation mark (#26) --- index.js | 2 +- test/index.test.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 2ded6ea..789dbbf 100644 --- a/index.js +++ b/index.js @@ -8,7 +8,7 @@ var slash = '/'; var backslash = /\\/g; var enclosure = /[\{\[].*[\/]*.*[\}\]]$/; var globby = /(^|[^\\])([\{\[]|\([^\)]+$)/; -var escaped = /\\([\*\?\|\[\]\(\)\{\}])/g; +var escaped = /\\([\!\*\?\|\[\]\(\)\{\}])/g; /** * @param {string} str diff --git a/test/index.test.js b/test/index.test.js index d3e7a71..c13bf04 100644 --- a/test/index.test.js +++ b/test/index.test.js @@ -78,6 +78,7 @@ describe('glob-parent', function() { assert.equal(gp('[bar]/'), '.'); assert.equal(gp('./\\[bar]'), './[bar]'); assert.equal(gp('\\[bar]/'), '[bar]'); + assert.equal(gp('\\!dir/*'), '!dir'); assert.equal(gp('[bar\\]/'), '.'); assert.equal(gp('path/foo \\[bar]/'), 'path/foo [bar]'); assert.equal(gp('path/\\{foo,bar}/'), 'path/{foo,bar}'); From 4731d2b1cb0fcd8671129746e9e035cca6bfa42a Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 21 Mar 2020 15:14:08 -0700 Subject: [PATCH 3/8] ci: add npm revert step to azure --- .ci/.azure-pipelines-steps.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ci/.azure-pipelines-steps.yml b/.ci/.azure-pipelines-steps.yml index b54ea9b..5f99800 100644 --- a/.ci/.azure-pipelines-steps.yml +++ b/.ci/.azure-pipelines-steps.yml @@ -4,6 +4,9 @@ steps: versionSpec: '$(node_version)' displayName: Use Node $(node_version) +- script: npm install -g npm@6.4.1 + displayName: Revert npm to 6.4.1 (known working) + - script: npm install displayName: npm install From 473f5d87644bf19f32c53de21d2420f03aa02e5a Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 21 Mar 2020 15:23:22 -0700 Subject: [PATCH 4/8] ci: update azure build images --- .ci/.azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/.azure-pipelines.yml b/.ci/.azure-pipelines.yml index 9294859..46f73c7 100644 --- a/.ci/.azure-pipelines.yml +++ b/.ci/.azure-pipelines.yml @@ -21,7 +21,7 @@ jobs: - job: Test_Windows displayName: Run Tests on Windows pool: - vmImage: vs2017-win2016 + vmImage: "windows-2019" strategy: matrix: Node_v10: @@ -36,7 +36,7 @@ jobs: - job: Test_MacOS displayName: Run Tests on MacOS pool: - vmImage: macos-10.13 + vmImage: "macOS-10.15" strategy: matrix: Node_v10: From 0b5b37f674a7e207457c99cb2f123299e5ab31c9 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 21 Mar 2020 15:27:08 -0700 Subject: [PATCH 5/8] ci: put the npm step back in for only Windows --- .ci/.azure-pipelines-steps.yml | 7 ++++--- .ci/.azure-pipelines.yml | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.ci/.azure-pipelines-steps.yml b/.ci/.azure-pipelines-steps.yml index 5f99800..86d0984 100644 --- a/.ci/.azure-pipelines-steps.yml +++ b/.ci/.azure-pipelines-steps.yml @@ -1,12 +1,13 @@ steps: +- script: npm i -g npm@$(npm_version) + displayName: Use non-broken npm version $(npm_version) + condition: ne(variables['npm_version'], '') + - task: NodeTool@0 inputs: versionSpec: '$(node_version)' displayName: Use Node $(node_version) -- script: npm install -g npm@6.4.1 - displayName: Revert npm to 6.4.1 (known working) - - script: npm install displayName: npm install diff --git a/.ci/.azure-pipelines.yml b/.ci/.azure-pipelines.yml index 46f73c7..195683a 100644 --- a/.ci/.azure-pipelines.yml +++ b/.ci/.azure-pipelines.yml @@ -26,8 +26,10 @@ jobs: matrix: Node_v10: node_version: 10 + npm_version: 6.4.1 Node_v8: node_version: 8 + npm_version: 6.4.1 Node_v6: node_version: 6 steps: From 5d39def48c9e9eaee0ca36dafdf7b6cdcd875b85 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 21 Mar 2020 15:33:06 -0700 Subject: [PATCH 6/8] ci: attempt to switch to published coveralls --- .ci/.azure-pipelines-steps.yml | 10 +++------- package.json | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.ci/.azure-pipelines-steps.yml b/.ci/.azure-pipelines-steps.yml index 86d0984..22b0695 100644 --- a/.ci/.azure-pipelines-steps.yml +++ b/.ci/.azure-pipelines-steps.yml @@ -17,14 +17,10 @@ steps: - script: npm run coveralls displayName: Run coveralls env: - # Pretend to be AppVeyor for now - APPVEYOR: true - APPVEYOR_BUILD_NUMBER: $(Build.BuildNumber) - APPVEYOR_BUILD_ID: $(Agent.OS)_$(node_version) - APPVEYOR_REPO_COMMIT: $(Build.SourceVersion) - APPVEYOR_REPO_BRANCH: $(Build.SourceBranchName) - # Overwrite the AppVeyor Service Name COVERALLS_SERVICE_NAME: Azure Pipelines + COVERALLS_SERVICE_NUMBER: $(Build.BuildNumber) + COVERALLS_SERVICE_JOB_ID: $(Agent.OS)_$(node_version) + COVERALLS_GIT_BRANCH: $(Build.SourceBranchName) COVERALLS_REPO_TOKEN: $(COVERALLS_REPO_TOKEN_SECRET) COVERALLS_PARALLEL: true CI_PULL_REQUEST: $(System.PullRequest.PullRequestNumber) diff --git a/package.json b/package.json index 0f7ec23..7b44b40 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "is-glob": "^4.0.1" }, "devDependencies": { - "coveralls": "github:phated/node-coveralls#2.x", + "coveralls": "^3.0.11", "eslint": "^2.13.1", "eslint-config-gulp": "^3.0.1", "expect": "^1.20.2", From 749c35ee084498ebb1ce8cc9cf655f6aa4d623c5 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 21 Mar 2020 15:46:39 -0700 Subject: [PATCH 7/8] ci: try wrapping the JOB_ID in a string --- .ci/.azure-pipelines-steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/.azure-pipelines-steps.yml b/.ci/.azure-pipelines-steps.yml index 22b0695..59369c3 100644 --- a/.ci/.azure-pipelines-steps.yml +++ b/.ci/.azure-pipelines-steps.yml @@ -19,7 +19,7 @@ steps: env: COVERALLS_SERVICE_NAME: Azure Pipelines COVERALLS_SERVICE_NUMBER: $(Build.BuildNumber) - COVERALLS_SERVICE_JOB_ID: $(Agent.OS)_$(node_version) + COVERALLS_SERVICE_JOB_ID: "$(Agent.OS)_$(node_version)" COVERALLS_GIT_BRANCH: $(Build.SourceBranchName) COVERALLS_REPO_TOKEN: $(COVERALLS_REPO_TOKEN_SECRET) COVERALLS_PARALLEL: true From 9b6e8747ddf664c9b1a36fbd2a23e43a35b8a52f Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Sat, 21 Mar 2020 16:03:39 -0700 Subject: [PATCH 8/8] chore: release 5.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7b44b40..1dfd6bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "glob-parent", - "version": "5.1.0", + "version": "5.1.1", "description": "Extract the non-magic parent path from a glob string.", "author": "Gulp Team (https://gulpjs.com/)", "contributors": [