Skip to content

Commit

Permalink
Merge pull request #80 from UCMercedACM/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrian Darian committed Jun 3, 2020
2 parents 453e20e + 1bc5d2c commit 1b89c32
Show file tree
Hide file tree
Showing 179 changed files with 7,682 additions and 5,968 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Describe the big picture of your changes here to communicate to the maintainers

## Types of changes

What types of changes does your code introduce to Appium?
What types of changes does your code introduce to the Chapter Website?
_Put an `x` in the boxes that apply_

- [ ] Bugfix (non-breaking change which fixes an issue)
Expand Down
24 changes: 12 additions & 12 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# Add 'test' label to any change to *.spec.js files within the source dir
test:
- src/**/*.spec.js
- e2e/*
test:
- src/**/*.spec.js
- e2e/*

# Add 'workflows' label to any new or updated GitHub action workflow
workflows:
- .github/workflows/*
workflows:
- .github/workflows/*

# Add 'actions' label to any new or updated GitHub action workflow
actions:
- .github/actions/*
actions:
- .github/actions/*

# Add 'angular' label to any changes done to the React application
angular:
- src/*
- src/*

# Add 'angular' label to any changes done to the React application
ngrx:
- src/app/root-store
- src/app/root-store/*

# Add the 'documentation' label to any changes in either of the documented files
documentation:
- README.md
- LICENSE
- CODE_OF_CONDUCT.md
- README.md
- LICENSE
- CODE_OF_CONDUCT.md
72 changes: 36 additions & 36 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
name: Build CI

on:
pull_request:
branches:
- develop
on:
pull_request:
branches:
- develop

jobs:
build:
name: Test application and make sure it runs on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
matrix:
node-version: [11.x]
os: [ubuntu-latest]

steps:
- name: Checkout to current branch
uses: actions/checkout@v2

- name: Configure Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Ensure a clean branch
run: |
echo 'Cleaning repo before executing build script...'
yarn clean
- name: Install Dependencies
run: |
echo 'Running Setup...'
yarn install
- name: Build Angular Application
run: |
echo 'Building Angular Application...'
yarn build
build:
name: Test application and make sure it runs on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
matrix:
node-version: [11.x]
os: [ubuntu-latest]

steps:
- name: Checkout to current branch
uses: actions/checkout@v2

- name: Configure Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Ensure a clean branch
run: |
echo 'Cleaning repo before executing build script...'
yarn clean
- name: Install Dependencies
run: |
echo 'Running Setup...'
yarn install
- name: Build Angular Application
run: |
echo 'Building Angular Application...'
yarn build
12 changes: 6 additions & 6 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: "Pull Request Labeler"
on: [pull_request]

jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v2
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
triage:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v2
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
74 changes: 37 additions & 37 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
name: Lint CI

on:
pull_request:
branches:
- develop
- master
on:
pull_request:
branches:
- develop
- master

jobs:
build:
name: Test application and make sure it runs on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
matrix:
node-version: [11.x]
os: [ubuntu-latest]

steps:
- name: Checkout to current branch
uses: actions/checkout@v2

- name: Configure Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Ensure a clean branch
run: |
echo 'Cleaning repo before executing lint script...'
yarn clean
- name: Install Dependencies
run: |
echo 'Running Setup...'
yarn install
- name: Lint Angular Application
run: |
echo 'Linting Angular Application...'
yarn lint
build:
name: Test application and make sure it runs on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

strategy:
matrix:
node-version: [11.x]
os: [ubuntu-latest]

steps:
- name: Checkout to current branch
uses: actions/checkout@v2

- name: Configure Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Ensure a clean branch
run: |
echo 'Cleaning repo before executing lint script...'
yarn clean
- name: Install Dependencies
run: |
echo 'Running Setup...'
yarn install
- name: Lint Angular Application
run: |
echo 'Linting Angular Application...'
yarn lint
134 changes: 67 additions & 67 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,85 +1,85 @@
name: Deploy and Update Release Notes

on:
push:
branches:
- master # Successful Merge on master branch
push:
branches:
- master # Successful Merge on master branch

jobs:
deploy:
name: Deploy Angular Application
runs-on: ${{ matrix.os }}
deploy:
name: Deploy Angular Application
runs-on: ${{ matrix.os }}

strategy:
matrix:
node-version: [12.x]
os: [ubuntu-latest]
strategy:
matrix:
node-version: [12.x]
os: [ubuntu-latest]

steps:
- name: Checkout to current branch
uses: actions/checkout@v2
with:
persist-credentials: false
steps:
- name: Checkout to current branch
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Configure Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Configure Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install Dependencies
run: |
echo 'Running Setup...'
yarn install
npm install -g @angular/cli
- name: Install Dependencies
run: |
echo 'Running Setup...'
yarn install
npm install -g @angular/cli
- name: Building Production Environment
run: |
echo 'Building and Compiling...'
rm -rf dist
yarn build
echo ${{ secrets. ACCESS_TOKEN }}
- name: Building Production Environment
run: |
echo 'Building and Compiling...'
rm -rf dist
yarn build
echo ${{ secrets. ACCESS_TOKEN }}
- name: Angular Deploy gh-pages Actions
uses: JamesIves/github-pages-deploy-action@releases/v3
with:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} # see the Configuration section for how you can create secrets
COMMIT_MESSAGE: Release ${{ github.event.pull_request.head.ref }}
BRANCH: gh-pages # The branch the action should deploy to.
BASE_BRANCH: master
FOLDER: dist
- name: Angular Deploy gh-pages Actions
uses: JamesIves/github-pages-deploy-action@releases/v3
with:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} # see the Configuration section for how you can create secrets
COMMIT_MESSAGE: Release ${{ github.event.pull_request.head.ref }}
BRANCH: gh-pages # The branch the action should deploy to.
BASE_BRANCH: master
FOLDER: dist

- name: Tag Deployment
run: |
echo 'Tagging Deployment...'
git tag -l ${{ github.event.pull_request.head.ref }}
- name: Tag Deployment
run: |
echo 'Tagging Deployment...'
git tag -l ${{ github.event.pull_request.head.ref }}
release:
name: Update Release notes and Changelog
runs-on: ${{ matrix.os }}
needs: deploy
release:
name: Update Release notes and Changelog
runs-on: ${{ matrix.os }}
needs: deploy

strategy:
matrix:
node-version: [12.x]
os: [ubuntu-latest]
strategy:
matrix:
node-version: [12.x]
os: [ubuntu-latest]

steps:
- name: Checkout to current branch
uses: actions/checkout@v2
with:
persist-credentials: false
steps:
- name: Checkout to current branch
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Configure Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Configure Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Install Dependencies
run: |
echo 'Running Setup...'
yarn install
- name: Install Dependencies
run: |
echo 'Running Setup...'
yarn install
- name: Update Release notes
run: |
echo 'Update Release Notes...'
npm run gren -- --token=${{ secrets.GREN_GITHUB_TOKEN }}
- name: Update Release notes
run: |
echo 'Update Release Notes...'
npm run gren -- --token=${{ secrets.GREN_GITHUB_TOKEN }}
Loading

0 comments on commit 1b89c32

Please sign in to comment.