From 3c1da7166c858a03e606526d5cdd71667d1d4abf Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Tue, 14 Feb 2023 16:36:40 -0800 Subject: [PATCH 1/2] Fix webpack 4 build --- .circleci/comment.js | 4 ++-- .circleci/config.yml | 2 +- examples/rsp-webpack-4/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/comment.js b/.circleci/comment.js index cd84dfc46e3..ee9505cae7a 100644 --- a/.circleci/comment.js +++ b/.circleci/comment.js @@ -11,7 +11,7 @@ async function run() { let pr; // If we aren't running on a PR commit, double check if this is a branch created for a fork. If so, we'll need to // comment the build link on the fork. - if (!process.env.CIRCLE_PULL_REQUEST) { + if (true) { try { const commit = await octokit.git.getCommit({ owner: 'adobe', @@ -41,7 +41,7 @@ async function run() { break; } } - } else if (process.env.CIRCLE_BRANCH === 'main') { + } else if (process.env.CIRCLE_BRANCH === 'fix-webpack-build') { //If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build await octokit.repos.createCommitComment({ owner: 'adobe', diff --git a/.circleci/config.yml b/.circleci/config.yml index 5665d79bf6b..3d9cc897dc5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -519,7 +519,7 @@ workflows: - docs-verdaccio: filters: branches: - only: main + only: fix-webpack-build requires: - install - deploy: diff --git a/examples/rsp-webpack-4/package.json b/examples/rsp-webpack-4/package.json index 68b4f7798c9..708293ae05b 100644 --- a/examples/rsp-webpack-4/package.json +++ b/examples/rsp-webpack-4/package.json @@ -23,7 +23,7 @@ "@babel/cli": "^7.1.0", "@babel/preset-env": "^7.1.0", "@babel/preset-react": "^7.0.0", - "webpack": "4.19.1", + "webpack": "^4.46.0", "webpack-cli": "3.1.1", "webpack-dev-server": "3.1.8", "style-loader": "0.23.0", From 85eb80474ac03b8e00eb33dc59774c7e4b9a964a Mon Sep 17 00:00:00 2001 From: Rob Snow Date: Tue, 14 Feb 2023 16:53:35 -0800 Subject: [PATCH 2/2] revert verdaccio build --- .circleci/comment.js | 4 ++-- .circleci/config.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/comment.js b/.circleci/comment.js index ee9505cae7a..cd84dfc46e3 100644 --- a/.circleci/comment.js +++ b/.circleci/comment.js @@ -11,7 +11,7 @@ async function run() { let pr; // If we aren't running on a PR commit, double check if this is a branch created for a fork. If so, we'll need to // comment the build link on the fork. - if (true) { + if (!process.env.CIRCLE_PULL_REQUEST) { try { const commit = await octokit.git.getCommit({ owner: 'adobe', @@ -41,7 +41,7 @@ async function run() { break; } } - } else if (process.env.CIRCLE_BRANCH === 'fix-webpack-build') { + } else if (process.env.CIRCLE_BRANCH === 'main') { //If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build await octokit.repos.createCommitComment({ owner: 'adobe', diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d9cc897dc5..5665d79bf6b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -519,7 +519,7 @@ workflows: - docs-verdaccio: filters: branches: - only: fix-webpack-build + only: main requires: - install - deploy: