Skip to content

Commit 4f11911

Browse files
authored
[release:minor]: Updated dependencies and CircleCI config.
1 parent 24f4980 commit 4f11911

File tree

13 files changed

+162
-155
lines changed

13 files changed

+162
-155
lines changed

.all-contributorsrc

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"files": [
3+
"README.md"
4+
],
5+
"imageSize": 100,
6+
"contributorsPerLine": 7,
7+
"contributorsSortAlphabetically": false,
8+
"badgeTemplate": "[![All Contributors](https://img.shields.io/badge/all_contributors-<%= contributors.length %>-17BB8A.svg?style=for-the-badge&labelColor=000000)](#contributors)",
9+
"types": {
10+
"custom": {
11+
"symbol": "🔭",
12+
"description": "A custom contribution type.",
13+
"link": "[<%= symbol %>](<%= url %> \"<%= description %>\"),"
14+
}
15+
},
16+
"skipCi": true,
17+
"contributors": [],
18+
"projectName": "coteafs-selenium",
19+
"projectOwner": "WasiqB",
20+
"repoType": "github",
21+
"repoHost": "https://github.com"
22+
}

.circleci/config.yml

Lines changed: 42 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,51 @@
1-
default: &default
2-
working_directory: ~/repo
3-
docker:
4-
- image: circleci/openjdk:11-jdk-stretch
5-
- image: selenium/standalone-chrome:latest
61
version: 2.1
7-
jobs:
8-
code_checkout:
9-
<<: *default
10-
steps:
11-
- checkout
12-
- save_cache:
13-
key: repo-{{ .Branch }}-{{ .Revision }}
14-
paths:
15-
- ~/repo
16-
resolve_dependencies:
17-
<<: *default
18-
steps:
19-
- restore_cache:
20-
keys:
21-
- repo-{{ .Branch }}-{{ .Revision }}
22-
- run:
23-
name: Resolve Dependencies
24-
command: mvn dependency:resolve
25-
- save_cache:
26-
paths:
27-
- ~/.m2
28-
key: repo-dependency-{{ .Branch }}-{{ .Revision }}
29-
build:
30-
<<: *default
31-
steps:
32-
- restore_cache:
33-
key: repo-{{ .Branch }}-{{ .Revision }}
34-
- restore_cache:
35-
key: repo-dependency-{{ .Branch }}-{{ .Revision }}
36-
- run:
37-
name: Build project
38-
command: mvn install -DskipTests
39-
- save_cache:
40-
key: repo-target-{{ .Branch }}-{{ .Revision }}
41-
paths:
42-
- target/
43-
test:
44-
<<: *default
45-
steps:
46-
- attach_workspace:
47-
at: .
48-
- restore_cache:
49-
key: repo-{{ .Branch }}-{{ .Revision }}
50-
- restore_cache:
51-
key: repo-dependency-{{ .Branch }}-{{ .Revision }}
52-
- restore_cache:
53-
key: repo-target-{{ .Branch }}-{{ .Revision }}
54-
- run:
55-
name: Install Chrome
56-
command: |
57-
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
58-
sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
59-
sudo apt-get update
60-
sudo apt-get install google-chrome-stable
61-
- run:
62-
name: Run Tests with Sonar Coverage
63-
command: mvn org.jacoco:jacoco-maven-plugin:prepare-agent install -Pcoverage-per-test -DCLOUD_USER=$BS_USER -DCLOUD_KEY=$BS_KEY
64-
- save_cache:
65-
key: repo-reports-{{ .Branch }}-{{ .Revision }}
66-
paths:
67-
- reports/
68-
code_analysis:
69-
<<: *default
70-
steps:
71-
- restore_cache:
72-
key: repo-{{ .Branch }}-{{ .Revision }}
73-
- restore_cache:
74-
key: repo-dependency-{{ .Branch }}-{{ .Revision }}
75-
- restore_cache:
76-
key: repo-target-{{ .Branch }}-{{ .Revision }}
77-
- restore_cache:
78-
key: repo-reports-{{ .Branch }}-{{ .Revision }}
79-
- run:
80-
name: Update Sonar Analysis
81-
command: mvn package sonar:sonar -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -DskipTests -Dsonar.branch.name=$CIRCLE_BRANCH
822

83-
filters: &all_branches
84-
branches:
85-
only:
86-
- develop
87-
- master
88-
- release
89-
- /issue-.*/
3+
orbs:
4+
maven-deploy: wasiqb/[email protected]
5+
6+
branches: &all
7+
only:
8+
- master
9+
- release
10+
- /issue-.*/
9011

9112
workflows:
92-
version: 2
93-
normal_flow:
13+
workflow:
9414
jobs:
95-
- code_checkout:
96-
filters: *all_branches
97-
- resolve_dependencies:
98-
filters: *all_branches
15+
- maven-deploy/code-checkout
16+
- maven-deploy/resolve-dependency:
17+
requires:
18+
- maven-deploy/code-checkout
19+
filters:
20+
branches:
21+
<<: *all
22+
- maven-deploy/build:
9923
requires:
100-
- code_checkout
101-
- build:
102-
filters: *all_branches
24+
- maven-deploy/resolve-dependency
25+
filters:
26+
branches:
27+
<<: *all
28+
- maven-deploy/test:
10329
requires:
104-
- resolve_dependencies
105-
- test:
30+
- maven-deploy/build
31+
filters:
32+
branches:
33+
<<: *all
34+
- maven-deploy/sonar-analysis:
10635
requires:
107-
- build
108-
filters: *all_branches
109-
- code_analysis:
36+
- maven-deploy/test
37+
filters:
38+
branches:
39+
<<: *all
40+
context: RELEASE_PROFILE_WASIQB
41+
- maven-deploy/deploy:
42+
mentions: mfaisalkhatri,wbhamla1
43+
fail_only: false
44+
filters:
45+
branches:
46+
only:
47+
- master
11048
requires:
111-
- test
112-
filters: *all_branches
49+
- maven-deploy/sonar-analysis
50+
context: RELEASE_PROFILE_WASIQB
51+
deploy-command: mvn deploy --settings settings/settings.xml -DskipTests -Dcheckstyle.skip -B -Prelease

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @WasiqB

.github/CONTRIBUTING.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
# Contributing to coteafs-selenium.
1+
# Contributing to <project-name>.
22

33
:+1: :tada: Firstly, thanks for taking the time to contribute! :tada: :+1:
44

5-
The following are set of guidelines for contributing towards this framework on Github. These are mostly guidelines, not rules. Use your best judgement, and feel free to propose changes to this document in a pull request.
5+
The following are the set of guidelines for contributing towards this repository on Github. These are mostly guidelines
6+
, not rules. Use your best judgement, and feel free to propose changes to this project in a pull request.
67

78
## Code Contribution
89

910
## 1. Where to start from?
1011

11-
If you've noticed a bug or have a question plesae check the [search the issue tracker][tracker] to see if someone else has already created a ticket. If not, go ahead and [add one][new issue]!
12+
If you've noticed a bug or have a question, then kindly [search the issue tracker][tracker] to see if someone
13+
else has already created a ticket. If not, go ahead and [add one][new issue]!
1214

13-
## 2. Want to fix an issue or add new feature?
15+
## 2. Want to fix an issue or add a new feature?
1416

1517
If this is something you think you can fix, then follow the following steps:
1618

@@ -28,7 +30,7 @@ To Fork and clone the repository, see this useful [post][fork].
2830

2931
### Step 4: Create new Branch
3032

31-
Now create a new branch with descriptive name in your forked repo. Refer [here][branch] to know about Git branches.
33+
Now create a new branch with a descriptive name in your forked repo. Refer [here][branch] to know about Git branches.
3234

3335
### Step 5: Commit with a descriptive message
3436

@@ -51,7 +53,9 @@ There is a process in place to help maintain the quality of the framework. To ad
5153

5254
### Git workflow
5355

54-
Since the repository is hosted on GitHub, it has been configured to only accept **signed commits** from any contributor (_including me :wink:_). So make sure to **sign your commits** before sending Pull Request, **else the it will be rejected**. To know more about signed commits, check out this [post][sign-commit].
56+
Since the repository is hosted on GitHub, it has been configured to only accept **signed commits** from any
57+
contributor (_including me :wink:_). So make sure to **sign your commits** before sending Pull Request, **else the
58+
PR will be rejected**. To know more about signed commits, check out this [post][sign-commit].
5559

5660
### Branching strategy
5761

@@ -70,7 +74,7 @@ Any work being done on any open tickets, should be done in a new branch with nam
7074

7175
Any Pull Request raised should make sure following checks are successful:
7276
- Pull Request is raised to merge changes to `develop` branch.
73-
- Commits are signed.
77+
- Commits is GPG signed.
7478
- There is at least one reviewer.
7579
- Circle CI tests are green.
7680
- Branch is up to date with `develop` branch.
Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,26 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
5-
labels: ''
4+
title: '[Bug]'
5+
labels: bug
66
assignees: ''
7-
87
---
98

10-
**Describe the bug**
9+
## Describe the bug
1110
A clear and concise description of what the bug is.
1211

13-
**To Reproduce**
14-
Steps to reproduce the behavior:
12+
## To Reproduce
13+
Steps to reproduce the behaviour:
1514
1. Go to '...'
1615
2. Click on '....'
1716
3. Scroll down to '....'
1817
4. See error
1918

20-
**Expected behavior**
19+
## Expected behaviour
2120
A clear and concise description of what you expected to happen.
2221

23-
**Screenshots**
22+
## Screenshots
2423
If applicable, add screenshots to help explain your problem.
2524

26-
**Desktop (please complete the following information):**
27-
- OS: [e.g. iOS]
28-
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
30-
31-
**Smartphone (please complete the following information):**
32-
- Device: [e.g. iPhone6]
33-
- OS: [e.g. iOS8.1]
34-
- Browser [e.g. stock browser, safari]
35-
- Version [e.g. 22]
36-
37-
**Additional context**
25+
## Additional context
3826
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Suggestions, Ideas, Bugs, Queries
4+
url: https://github.com/WasiqB/coteafs-selenium/issues/new/choose
5+
about: Please raise a ticket.
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ''
5-
labels: ''
4+
title: '[New feature]'
5+
labels: enhancement
66
assignees: ''
7-
87
---
98

10-
**Is your feature request related to a problem? Please describe.**
9+
## Is your feature request related to a problem? Please describe.
1110
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
1211

13-
**Describe the solution you'd like**
12+
## Describe the solution you'd like
1413
A clear and concise description of what you want to happen.
1514

16-
**Describe alternatives you've considered**
15+
## Describe alternatives you've considered
1716
A clear and concise description of any alternative solutions or features you've considered.
1817

19-
**Additional context**
18+
## Additional context
2019
Add any other context or screenshots about the feature request here.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Query or discussion
3+
about: Clear your queries or discuss on some topic.
4+
title: '[Discussion]'
5+
labels: help wanted
6+
assignees: ''
7+
---
8+
9+
## Describe your topic for discussion or query
10+
A clear concise description about the topic you want to discuss.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## Closes: #[ticket no]
2+
3+
### What are the changes and their implications?
4+
Describe the changes done.
5+
6+
### Checklist
7+
Select all the applicable options:
8+
9+
- [ ] Breaking (_non-backward compatible_) changes
10+
- [ ] Tests added for changes
11+
- [ ] JavaDoc updated in main and test classes
12+
- [ ] README updated (if applicable)
13+
- [ ] PR with the documentation for the feature raised in the [documentation repo](https://github.com/WasiqB/wasiqb.github.io)
14+
15+
<!-- IMPORTANT: Make sure to check the "Allow edits from maintainers" box below this window -->

.gitignore

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
/target/
2-
/test-output/
3-
/reports/
4-
/logs/
1+
# IntelliJ IDEA
2+
/.idea/
3+
*.iml
4+
5+
# Eclipse IDE
56
/.settings/
67
/.classpath
78
/.project
8-
/.idea/
9-
*.iml
10-
.DS_Store
9+
10+
# Other output folders
11+
/target/
12+
/bin/
13+
/test-output/
14+
/logs/
15+
/reports/
1116
/video/
12-
/screenshots/
17+
/screenshots/
18+
19+
# Mac OSX
20+
.DS_Store

0 commit comments

Comments
 (0)