Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(dev,proxy): ent-3643 activate chrome2 for local run #757

Merged
merged 3 commits into from
Aug 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ REACT_APP_CONFIG_SERVICE_LOCALES=${UI_DEPLOY_PATH_PREFIX}/apps/subscriptions/loc
REACT_APP_CONFIG_SERVICE_LOCALES_PATH=${UI_DEPLOY_PATH_PREFIX}/apps/subscriptions/locales/{{lng}}.json
REACT_APP_CONFIG_SERVICE_LOCALES_EXPIRE=604800000

REACT_APP_INCLUDE_CONTENT_HEADER=<esi:include src="${UI_DEPLOY_PATH_PREFIX}/apps/chrome/snippets/head.html" />
REACT_APP_INCLUDE_CONTENT_BODY=<esi:include src="${UI_DEPLOY_PATH_PREFIX}/apps/chrome/snippets/body.html" />

REACT_APP_SERVICES_RHSM_VERSION=/api/rhsm-subscriptions/v1/version
REACT_APP_SERVICES_RHSM_REPORT=/api/rhsm-subscriptions/v1/tally/products/
REACT_APP_SERVICES_RHSM_CAPACITY=/api/rhsm-subscriptions/v1/capacity/products/
Expand Down
3 changes: 1 addition & 2 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
DEV_PORT=3000
DEV_BRANCH=prod-stable
DEV_BRANCH=ci-beta

REACT_APP_ENV=development
REACT_APP_UI_DEPLOY_PATH_PREFIX=/beta

REACT_APP_CONFIG_SERVICE_LOCALES=/locales/locales.json
REACT_APP_CONFIG_SERVICE_LOCALES_PATH=/locales/{{lng}}.json
Expand Down
2 changes: 1 addition & 1 deletion .env.proxy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DEV_PORT=443
DEV_BRANCH=ci-stable
DEV_BRANCH=ci-beta

REACT_APP_ENV=review

Expand Down
5 changes: 3 additions & 2 deletions .travis/custom_release.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
#!/bin/bash
#
#
# Release a branch
# Release a branch. APP_BUILD_DIR should be updated at the Travis configuration level.
release()
{
local DEPLOY_BRANCH=$1
local BUILD_DIR=$APP_BUILD_DIR

printf "${YELLOW}PUSHING ${DEPLOY_BRANCH}${NOCOLOR}\n"
rm -rf ./dist/.git
rm -rf "./${BUILD_DIR}/.git"
.travis/release.sh "${DEPLOY_BRANCH}"
printf "${GREEN}COMPLETED ${DEPLOY_BRANCH}${NOCOLOR}\n"
}
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ It is required that all work is handled through GitHub's fork and pull workflow.
### Releases and Tagging
1. Merging a PR into `master` is considered production ready.
1. Merging a PR into `master` doesn't require tagging and [CHANGELOG.md](./CHANGELOG.md) updates.
1. Running `$ yarn release` after commits are merged into `master` generates the release commit and [CHANGELOG.md](./CHANGELOG.md). You may need to update/pull tags prior to running this command. This commit should be pushed towards `master`. This release commit is currently used as a purposeful block and may be automated in the future. [The commit message is recognized in the release script](./.travis/custom_release.sh#L41). This commit format controls when files are pushed towards production stable, and gives development a fallback when something goes wrong.
1. Tagging and `CHANGELOG.md` updates should be coordinated against a consistent release cycle, and can take place at an independent time.
1. Tagging should make use of semver.
1. Manipulating tags against commits directly should be avoided in favor of a semantic version increment, iteration.
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.dev.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const { config: webpackConfig, plugins } = config({
env: (/(prod|qa|ci)(-stable|-beta)$/.test(DEV_BRANCH) && DEV_BRANCH) || 'prod-stable',
port: Number.parseInt(DEV_PORT, 10),
rootFolder: _BUILD_RELATIVE_DIRNAME,
skipChrome2: true,
skipChrome2: false,
standalone: true,
useProxy: false,
htmlPlugin: setHtmlPlugin(),
Expand Down
2 changes: 1 addition & 1 deletion config/webpack.proxy.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const { config: webpackConfig, plugins } = config({
port: Number.parseInt(DEV_PORT, 10),
rootFolder: _BUILD_RELATIVE_DIRNAME,
routes: setProxyRoutes({ DEV_PORT, BETA_PREFIX }),
skipChrome2: true,
skipChrome2: false,
standalone: false,
useCloud: (!/prod-(beta|stable)$/.test(DEV_BRANCH) && true) ?? false,
useProxy: true,
Expand Down