Skip to content
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' }}
steps:
- name: Checkout [main]
- name: Checkout [main] 🛎️
uses: actions/checkout@v2
with:
fetch-depth: 0
Expand All @@ -25,9 +25,9 @@ jobs:
with:
node-version: '14'

- name: Install Dependencies
- name: Install Dependencies 🔧
run: npm install --no-package-lock

- run: npx nx-cloud start-ci-run
- run: npx nx affected --target=build --parallel --max-parallel=3
- run: npx nx affected --target=test --parallel --max-parallel=2
Expand All @@ -36,7 +36,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }}
steps:
- name: Checkout [main]
- name: Checkout [main] 🛎️
uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.ref }}
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
matrix:
agent: [1, 2, 3]
steps:
- name: Checkout [main]
- name: Checkout [main] 🛎️
uses: actions/checkout@v2

- uses: actions/setup-node@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout [main]
- name: Checkout [main] 🛎️
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,13 @@ jobs:
if: github.event.action == 'closed' && github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: Checkout [main]
- name: Checkout [main] 🛎️
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Install Dependencies
- name: Install Dependencies 🔧
run: npm install --no-package-lock

- name: Build & Deploy 🚀
run: npm run build -- --prod --baseHref=/angular-jss/

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages # The branch the action should deploy to.
folder: dist/apps/website # The folder the action should deploy.
clean: true # Automatically remove deleted files from the deploy branch
run: npm run deploy
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip ci')"
runs-on: ubuntu-latest
steps:
- name: Checkout [main]
- name: Checkout [main] 🛎️
uses: actions/checkout@v2

- name: Install Dependencies
- name: Install Dependencies 🔧
run: npm install --no-package-lock

- name: Lint Workspace & Code
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Unit Tests
run: npm run affected:test -- --all

- name: Build, Release on GitHub & Publish to NPM
- name: Build, Release on GitHub & Publish to NPM 🚀
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN || secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-jss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"bugs": {
"url": "https://github.com/design4pro/angular-jss/issues/"
},
"homepage": "https://design4pro.github.io/angular-jss",
"homepage": "https://design4pro.github.io/angular-jss/",
"peerDependencies": {
"@angular/common": "^13.2.0",
"@angular/core": "^13.2.0"
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "design4pro",
"version": "0.0.0",
"license": "MIT",
"homepage": "https://design4pro.github.io/angular-jss",
"homepage": "https://design4pro.github.io/angular-jss/",
"scripts": {
"postinstall": "node ./decorate-angular-cli.js && ngcc --properties es2015 browser module main",
"ng": "nx",
Expand Down Expand Up @@ -30,7 +30,9 @@
"dep-graph": "nx dep-graph",
"help": "nx help",
"prerelease": "nx affected:build --all",
"release": "nx affected --target release --all"
"release": "nx affected --target release --all",
"predeploy": "npm run build -- --prod --baseHref=/angular-jss/",
"deploy": "gh-pages -d dist/apps/webpage"
},
"private": true,
"dependencies": {
Expand Down Expand Up @@ -82,6 +84,7 @@
"eslint": "~8.10.0",
"eslint-config-prettier": "8.4.0",
"eslint-plugin-cypress": "^2.10.3",
"gh-pages": "^3.2.3",
"hasky": "^3.0.2",
"jest": "27.2.3",
"jest-preset-angular": "11.1.1",
Expand Down