Skip to content

Commit

Permalink
Merge pull request #4 from denkiril/develop
Browse files Browse the repository at this point in the history
Upd angular up to 16, node - to 18. Fix bugs.
  • Loading branch information
denkiril authored Oct 11, 2023
2 parents 6e6e90b + 8547d16 commit 6297763
Show file tree
Hide file tree
Showing 71 changed files with 16,374 additions and 12,231 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/deploy2dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ on:
env:
API_URL: ${{ secrets.API_URL }}
YMAPS_APIKEY: ${{ secrets.YMAPS_APIKEY }}
MKRF_OPENDATA_APIKEY: ${{ secrets.MKRF_OPENDATA_APIKEY }}

jobs:
deploy:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/deploy2prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ on:
env:
API_URL: ${{ secrets.API_URL }}
YMAPS_APIKEY: ${{ secrets.YMAPS_APIKEY }}
MKRF_OPENDATA_APIKEY: ${{ secrets.MKRF_OPENDATA_APIKEY }}

jobs:
tests:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand All @@ -27,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ speed-measure-plugin*.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
5 changes: 3 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,10 @@
}
}
},
"defaultProject": "orel-guidebook",
"cli": {
"analytics": false,
"defaultCollection": "@angular-eslint/schematics"
"schematicCollections": [
"@angular-eslint/schematics"
]
}
}
Loading

0 comments on commit 6297763

Please sign in to comment.