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

Draft release 1.1.0, Sync Test to Stage #459

Merged
merged 20 commits into from
Oct 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bfe9d39
fix(build): npm updates (#420)
cdcabrera Sep 9, 2020
107805b
chore(docs): issues/418 PR template review notes (#424)
cdcabrera Sep 15, 2020
2e1de36
chore(docs): issues/406 spandx config notes (#425)
cdcabrera Sep 15, 2020
705a1a1
chore(build): npm update for react scripts (#426)
cdcabrera Sep 16, 2020
b2cac20
chore(build): activate GitHub workflow for PRs (#427)
cdcabrera Sep 17, 2020
f5f1c96
fix(testing): activate GitHub workflow for commits (#432)
cdcabrera Sep 25, 2020
6a881bb
perf(graphCardSelectors): expand query filters for graph (#433)
cdcabrera Sep 18, 2020
5da946c
feat(inventoryList): issues/410 activate column sorting (#433)
cdcabrera Sep 18, 2020
94e1eb6
fix(openshiftView,rhelView): issues/410 update sort default (#444)
cdcabrera Sep 30, 2020
9053a31
feat(minHeight): issues/403 set min-height, avoid page jumps (#439)
cdcabrera Sep 30, 2020
23bc3ba
fix(inventoryList,graphCard): issues/403 set minheight on update (#439)
cdcabrera Sep 26, 2020
7c6c540
feat(inventoryList): issues/442 activate last seen tooltip (#445)
cdcabrera Oct 1, 2020
1c747a5
fix(inventoryList): issues/403 minHeight update on perpage (#447)
cdcabrera Oct 6, 2020
57472b4
fix(minHeight): issues/403 resize events reset height (#447)
cdcabrera Oct 7, 2020
5d4bd1d
fix(inventoryList): activate paging for smaller screen sizes (#447)
cdcabrera Oct 7, 2020
0df7642
fix(chartArea): resize observer test addition (#447)
cdcabrera Oct 7, 2020
d3594a5
chore(build): travis stages for specific branches (#448)
cdcabrera Oct 8, 2020
1de1f22
chore(build): workflow for commits, deprecated set-env (#448)
cdcabrera Oct 8, 2020
51e4b41
chore(build): travis limit prod release to specific message (#451)
cdcabrera Oct 12, 2020
22cf693
fix(inventoryList): issues/403 adjust for expanded guestsList (#460)
cdcabrera Oct 13, 2020
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
17 changes: 16 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,21 @@
"prettier",
"react"
],
"settings": {
"jsdoc": {
"preferredTypes": {
"delete": "delete",
"get": "get",
"post": "post",
"put": "put",
"json": "json",
"text": "text",
"delayResponse": "DelayResponse",
"forceStatus": "ForceStatus",
"randomSuccess": "RandomSuccess"
}
}
},
"extends": [
"react-app",
"airbnb",
Expand Down Expand Up @@ -46,7 +61,7 @@
],
"import/no-named-as-default": 0,
"import/no-named-as-default-member": 0,
"jest/no-test-callback": 0,
"jest/no-done-callback": 0,
"jest/prefer-to-have-length": 0,
"jsdoc/check-tag-names": [
2,
Expand Down
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@

<!-- ### Notes -->
<!-- Any issues that aren't resolved by this merge request, or things of note? -->
<!--
When moving between environments notify a specific party
1. local > CI, Dev, Design should be assigned when relative
1. CI > QA, QE, CCS/docs should be notified
1. QA > Stage, QE and CCS/docs should be notified, AND applied as PR reviewers
1. Stage > Prod, QE and CCS/docs should be notified, AND applied as PR reviewers
-->

## How to test
<!-- Are there directions to test/review? -->
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/commit_lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Commit lint
on:
pull_request
env:
BRANCH: ${{ github.base_ref }}

jobs:
Commits:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Git commits
run: |
git remote add ssh-origin "https://github.com/$GITHUB_REPOSITORY"
git fetch ssh-origin
echo 'GIT_COMMITS<<EOF' >> $GITHUB_ENV
git cherry -v ssh-origin/${{ env.BRANCH }} | grep "+" >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Lint
uses: actions/github-script@v2
with:
script: |
const actionCommit = require(`${process.env.GITHUB_WORKSPACE}/scripts/actions.commit.js`)
const { resultsArray, resultsString } = actionCommit(process.env.GIT_COMMITS)

if (resultsArray.length) {
core.setFailed(resultsString)
}
79 changes: 79 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Pull request
on:
pull_request:
branches: [ master, main, prod, stage, test**, qa**, dev**, ci** ]
env:
BRANCH: ${{ github.base_ref }}

jobs:
Integration-checks:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v2
- name: Setup Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Set Node.js packages yarn cache directory
id: yarn-cache-dir
run: echo ::set-output name=CACHE_DIR::$(yarn cache dir)
- name: Node.js yarn cache
uses: actions/cache@v2
with:
path: ${{ steps.yarn-cache-dir.outputs.CACHE_DIR }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn
- name: Node.js modules cache
uses: actions/cache@v2
id: modules-cache
with:
path: ${{ github.workspace }}/node_modules
key: ${{ runner.os }}-${{ matrix.node-version }}-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-${{ matrix.node-version }}-modules
- name: Install Node.js packages
if: ${{ steps.modules-cache.outputs.cache-hit != 'true' }}
run: yarn install
- name: Lint and test
uses: actions/github-script@v2
with:
script: |
const { execSync } = require('child_process');
try {
console.log(`${execSync('yarn test', { stdio: 'pipe' })}`);
} catch ({ stdout, stderr }) {
core.setFailed(`${stdout}\n${stderr}`);
}
- name: Code coverage
if: ${{ success() }}
uses: codecov/codecov-action@v1
- name: Confirm beta integration
if: ${{ success() }}
uses: actions/github-script@v2
with:
script: |
const { execSync } = require('child_process');
try {
console.log(`${execSync('yarn build', { stdio: 'pipe' })}`);
} catch ({ stdout, stderr }) {
core.setFailed(`${stdout}\n${stderr}`);
}
env:
BUILD_STAGE: Beta
- name: Confirm stable integration
if: ${{ success() }}
uses: actions/github-script@v2
with:
script: |
const { execSync } = require('child_process');
try {
console.log(`${execSync('yarn build', { stdio: 'pipe' })}`);
} catch ({ stdout, stderr }) {
core.setFailed(`${stdout}\n${stderr}`);
}
env:
BUILD_STAGE: Stable
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ cache: yarn
jobs:
include:
- stage: Test
script: yarn test:lint
- before_script: yarn global add codecov
script: yarn test:ci
before_script: yarn global add codecov
script: yarn test
after_success: codecov
- stage: Beta Deploy
if: branch IN (stage, dev, ci)
script: yarn build && curl -sSL https://raw.githubusercontent.com/RedHatInsights/insights-frontend-builder-common/master/src/bootstrap.sh
| bash -s
- stage: Stable Deploy
if: branch IN (master, main, prod, test, qa)
script: yarn build && curl -sSL https://raw.githubusercontent.com/RedHatInsights/insights-frontend-builder-common/master/src/bootstrap.sh
| bash -s
env:
Expand Down
6 changes: 4 additions & 2 deletions .travis/custom_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ releaseProd()
release "prod-beta"
fi

if [[ "${TRAVIS_BRANCH}" = "prod-stable" || "${TRAVIS_BRANCH}" = "master" ]] && [[ $TRAVIS_BUILD_STAGE_NAME != *"Beta"* ]]; then
release "prod-stable"
if [[ "${TRAVIS_BRANCH}" = "prod-stable" || "${TRAVIS_BRANCH}" = "prod" || "${TRAVIS_BRANCH}" = "main" || "${TRAVIS_BRANCH}" = "master" ]] && [[ $TRAVIS_BUILD_STAGE_NAME != *"Beta"* ]]; then
if [[ "${TRAVIS_COMMIT_MESSAGE}" = *"chore(release):"* ]]; then
release "prod-stable"
fi
fi
}
#
Expand Down
10 changes: 10 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,16 @@ This project makes use of reserved DOM attributes used by the QE team.
1. Attribute `data-test`

DOM attributes with `data-test=""` are used by QE as a means to identify specific DOM elements.

### Reserved Files
#### Spandx Config
The configuration file(s) within this directory are utilized primarily during the `$ yarn start:proxy` local development run.

This file(s) has multiple team and build dependencies. **Before relocating/moving this file(s) the appropriate teams should be informed.**
- Development team
- QE team

There is a related integration test snapshot(s), `./tests/platform.test.js` that will need to be updated if this file(s) is updated.

## Testing
To test content you'll need to have Node and Yarn installed.
Expand Down
4 changes: 4 additions & 0 deletions config/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Spandx Config
This file(s) has multiple team and build dependencies. **Before relocating/moving this file(s) the appropriate teams should be informed.**

[See CONTRIBUTING.md for up-to-date information](../CONTRIBUTING.md#spandx-config)
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,65 +99,65 @@
"test:local": "react-scripts test --env=jsdom --roots=./src"
},
"dependencies": {
"@patternfly/patternfly": "4.23.3",
"@patternfly/react-charts": "6.6.0",
"@patternfly/react-core": "4.32.1",
"@patternfly/react-icons": "4.5.0",
"@patternfly/react-styles": "4.5.0",
"@patternfly/react-table": "4.12.1",
"@patternfly/react-tokens": "4.6.0",
"@redhat-cloud-services/frontend-components": "2.3.13",
"@redhat-cloud-services/frontend-components-notifications": "2.1.1",
"@redhat-cloud-services/frontend-components-utilities": "2.1.0",
"axios": "^0.19.2",
"c3": "^0.7.18",
"@patternfly/patternfly": "4.35.2",
"@patternfly/react-charts": "6.9.6",
"@patternfly/react-core": "4.47.0",
"@patternfly/react-icons": "4.7.4",
"@patternfly/react-styles": "4.7.3",
"@patternfly/react-table": "4.16.7",
"@patternfly/react-tokens": "4.9.6",
"@redhat-cloud-services/frontend-components": "2.4.5",
"@redhat-cloud-services/frontend-components-notifications": "2.2.1",
"@redhat-cloud-services/frontend-components-utilities": "2.2.1",
"axios": "^0.20.0",
"c3": "^0.7.20",
"classnames": "^2.2.6",
"i18next": "^19.6.2",
"i18next": "^19.7.0",
"i18next-xhr-backend": "^3.2.2",
"js-cookie": "^2.2.1",
"locale-code": "^2.0.2",
"lodash": "^4.17.19",
"lodash": "^4.17.20",
"moment": "^2.27.0",
"node-sass": "^4.14.1",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-i18next": "^11.7.0",
"react-redux": "^7.2.0",
"react-i18next": "^11.7.2",
"react-redux": "^7.2.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"react-scripts": "3.4.3",
"redux": "^4.0.5",
"redux-logger": "^3.0.6",
"redux-promise-middleware": "^6.1.2",
"redux-thunk": "^2.3.0",
"reselect": "^4.0.0",
"victory": "^35.0.5",
"victory-core": "^35.0.5",
"victory-legend": "^35.0.5"
"victory": "^35.0.9",
"victory-core": "^35.0.8",
"victory-legend": "^35.0.8"
},
"devDependencies": {
"apidoc-mock": "^3.0.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2",
"enzyme-adapter-react-16": "^1.15.4",
"enzyme-to-json": "^3.5.0",
"eslint-config-airbnb": "^18.2.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^23.18.0",
"eslint-plugin-jsdoc": "^29.2.0",
"eslint-plugin-json": "^2.1.1",
"eslint-plugin-jest": "^24.0.0",
"eslint-plugin-jsdoc": "^30.4.0",
"eslint-plugin-json": "^2.1.2",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.3",
"eslint-plugin-react-hooks": "^4.0.8",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-react-hooks": "^4.1.0",
"express": "^4.17.1",
"glob": "^7.1.6",
"moxios": "^0.4.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.0.5",
"prettier": "^2.1.1",
"redux-mock-store": "^1.5.4",
"standard-version": "^8.0.2",
"standard-version": "^9.0.0",
"swagger-ui-express": "^4.1.4",
"yamljs": "^0.3.0"
},
Expand Down
Loading