Skip to content

Commit

Permalink
Merge pull request #590 from etn-ccis/dev
Browse files Browse the repository at this point in the history
PR for merging Dev branch against master
  • Loading branch information
surajeaton authored May 10, 2024
2 parents 194011e + 66cd8ad commit d34a981
Show file tree
Hide file tree
Showing 146 changed files with 14,592 additions and 1,829 deletions.
176 changes: 0 additions & 176 deletions .circleci/config.yml

This file was deleted.

120 changes: 120 additions & 0 deletions .github/workflows/blui-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
name: Build

on:
push:
branches: [ "dev", "master" ]
pull_request:
branches: [ "dev", "master" ]
pull_request_target:
types:
- opened
branches:
- '*/*'

permissions:
pull-requests: write
contents: read

jobs:
prettier_lint:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: login-workflow
- run: yarn install:dependencies
working-directory: login-workflow
- run: yarn prettier
working-directory: login-workflow
- run: yarn lint
working-directory: login-workflow

unit_test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: login-workflow
- run: yarn --immutable
working-directory: login-workflow
- run: yarn test:ci --coverage --watchAll=false
working-directory: login-workflow
- name: Upload to Codecov
uses: codecov/codecov-action@v3
with:
directory: ./login-workflow/coverage/
files: clover.xml
flags: unittests
name: codecov-report
verbose: true

build_login_workflow:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'
cache-dependency-path: login-workflow
- run: yarn --immutable
working-directory: login-workflow
- run: yarn build
working-directory: login-workflow
- name: Save build
uses: actions/upload-artifact@v3
with:
name: dist
if-no-files-found: error
path: login-workflow/dist

publish_login_workflow:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') }}
needs: [prettier_lint, unit_test, build_login_workflow]
strategy:
matrix:
node-version: [18.x]
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
BRANCH: ${{ github.ref == 'refs/heads/master' && 'master' || 'dev' }}
steps:
- uses: actions/checkout@v4
- name: Download dist
uses: actions/download-artifact@v3
with:
name: dist
path: login-workflow/dist
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
registry-url: 'https://registry.npmjs.org'
cache-dependency-path: login-workflow
- run: yarn --immutable
- run: npm run publish:package -- -b ${{env.BRANCH}}
working-directory: login-workflow
10 changes: 10 additions & 0 deletions login-workflow/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v4.0.3 (May 9, 2024)

### Fixed

- Error Manager with dynamic values ([#540](https://github.com/etn-ccis/blui-react-workflows/issues/540)).
- Eula screen tests throws console warnings to wrap ([#390](https://github.com/etn-ccis/blui-react-workflows/issues/390)).
- Hardcoded dismissible Dialog button text ([#543](https://github.com/etn-ccis/blui-react-workflows/issues/543)).
- Fix dependency on react-router ([#546](https://github.com/etn-ccis/blui-react-workflows/issues/546)).
- Typo in Success screen readme ([#567](https://github.com/etn-ccis/blui-react-workflows/issues/547)).

## v4.0.2 (December 18, 2023)

### Added
Expand Down
4 changes: 2 additions & 2 deletions login-workflow/PUBLISHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Automatic Publishing

This package is published to NPM automatically by CircleCI when code is merged into the `dev` or `master` branches. To publish a new version, simply update the version in `package.json` and merge your code into the appropriate branch.
This package is published to NPM automatically by Github when code is merged into the `dev` or `master` branches. To publish a new version, simply update the version in `package.json` and merge your code into the appropriate branch.
- The `dev` branch will publish versions marked as `alpha` or `beta`.
- The `master` branch will publish any version (`alpha`, `beta`, or `latest`).
In both cases, the code will only be published if the version number differs from the current version published under the respective dist tag.
Expand All @@ -27,4 +27,4 @@ yarn build
npm adduser && yarn publish:package
```

> Publishing manually should only be done for `alpha` or `beta` packages. The command will work for `latest` packages, but this should be avoided except in rare situations where the automatic publishing functionality is not working in CircleCI.
> Publishing manually should only be done for `alpha` or `beta` packages. The command will work for `latest` packages, but this should be avoided except in rare situations where the automatic publishing functionality is not working in Github.
4 changes: 2 additions & 2 deletions login-workflow/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# React Auth Workflow
# Test React Auth Workflow

[![](https://img.shields.io/circleci/project/github/etn-ccis/blui-react-workflows/master.svg?style=flat)](https://circleci.com/gh/etn-ccis/blui-react-workflows/tree/master) ![npm (scoped)](https://img.shields.io/npm/v/@brightlayer-ui/react-auth-workflow) [![codecov](https://codecov.io/gh/etn-ccis/blui-react-workflows/branch/master/graph/badge.svg?token=H18T75WBFS)](https://codecov.io/gh/etn-ccis/blui-react-workflows)
[![Build](https://github.com/etn-ccis/blui-react-workflows/actions/workflows/blui-ci.yml/badge.svg?branch=master)](https://github.com/etn-ccis/blui-react-workflows/actions/workflows/blui-ci.yml) ![npm (scoped)](https://img.shields.io/npm/v/@brightlayer-ui/react-auth-workflow) [![codecov](https://codecov.io/gh/etn-ccis/blui-react-workflows/branch/master/graph/badge.svg?token=H18T75WBFS)](https://codecov.io/gh/etn-ccis/blui-react-workflows)

The React Auth Workflow package provides a consistent UI implementation of authentication-related capabilities for use in Eaton web applications built with React.

Expand Down
52 changes: 12 additions & 40 deletions login-workflow/codecov.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,13 @@
codecov:
require_ci_to_pass: yes
coverage:
precision: 2
round: down
range: "50...75"
status:
project: yes
patch: yes
changes: no
parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no
comment:
layout: "reach,diff,flags,tree"
behavior: default
require_changes: no
# - "::login-workflow/" # move root e.g., "path/" => "after/path/" leaving this here for now, it might need turned on later
flag_management:
default_rules:
carryforward: true
statuses:
- type: project
target: auto
threshold: 30%
- type: patch
target: 80%
individual_flags:
- name: unit_tests
paths:
- ./login-workflow/src
carryforward: true
statuses:
- type: project
target: 20%
- type: patch
target: 80%
coverage:
status:
project:
default:
target: 70%
threshold: 5%
informational: true
patch:
default:
target: 70%
threshold: 5%
informational: true
Loading

0 comments on commit d34a981

Please sign in to comment.