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

Move NX/Angular to project root #6

Merged
merged 3 commits into from
Feb 19, 2024
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
File renamed without changes.
File renamed without changes.
13 changes: 6 additions & 7 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
"on":
'on':
push:
branches:
- main
Expand All @@ -14,13 +14,12 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
cache-dependency-path: hosting/package-lock.json
- run: cd hosting && npm ci
- run: cd hosting && node_modules/.bin/nx build
cache: 'npm'
- run: npm ci
- run: node_modules/.bin/nx build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_CENSEO_IO }}"
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_CENSEO_IO }}'
channelId: live
projectId: censeo-io
19 changes: 9 additions & 10 deletions .github/workflows/firebase-hosting-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
"on": pull_request
'on': pull_request
jobs:
build_and_preview:
if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
runs-on: ubuntu-latest
permissions:
checks: write
Expand All @@ -16,15 +16,14 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
cache-dependency-path: hosting/package-lock.json
- run: cd hosting && npm ci
- run: cd hosting && node_modules/.bin/nx lint
- run: cd hosting && node_modules/.bin/nx test
- run: cd hosting && node_modules/.bin/nx build
cache: 'npm'
- run: npm ci
- run: node_modules/.bin/nx lint
- run: node_modules/.bin/nx test
- run: node_modules/.bin/nx build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: "${{ secrets.GITHUB_TOKEN }}"
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_CENSEO_IO }}"
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_CENSEO_IO }}'
projectId: censeo-io
expires: 2d
47 changes: 47 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# Logs
logs
*.log
Expand All @@ -7,6 +9,11 @@ yarn-error.log*
firebase-debug.log*
firebase-debug.*.log*

# Firebase
.firebase
*-debug.log
.runtimeconfig.json

# Firebase cache
.firebase/

Expand Down Expand Up @@ -64,3 +71,43 @@ node_modules/

# dotenv environment variables file
.env

# compiled output
dist
tmp
/out-tsc

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
.DS_Store
Thumbs.db

# Angular
.angular

# NX
.nx/cache
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"nrwl.angular-console",
"esbenp.prettier-vscode",
"firsttris.vscode-jest-runner",
"dbaeumer.vscode-eslint"
"dbaeumer.vscode-eslint",
"eamodio.gitlens"
]
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion firebase.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"hosting": {
"target": "censeo",
"public": "hosting/dist/censeo",
"public": "dist/censeo",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"headers": [
{
Expand Down
48 changes: 0 additions & 48 deletions hosting/.gitignore

This file was deleted.

Loading
Loading