Skip to content

Commit 19241ab

Browse files
Hristo313Hristo313
authored
Remove build step from angular github pages yaml files (#1348)
1 parent 8b6a632 commit 19241ab

File tree

10 files changed

+36
-50
lines changed

10 files changed

+36
-50
lines changed

‎packages/cli/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "igniteui-cli",
3-
"version": "14.3.0",
3+
"version": "14.3.1-beta.1",
44
"description": "CLI tool for creating Ignite UI projects",
55
"keywords": [
66
"CLI",
@@ -78,8 +78,8 @@
7878
"all": true
7979
},
8080
"dependencies": {
81-
"@igniteui/angular-templates": "~19.0.1430",
82-
"@igniteui/cli-core": "~14.3.0",
81+
"@igniteui/angular-templates": "~19.0.1431-beta.1",
82+
"@igniteui/cli-core": "~14.3.1-beta.1",
8383
"@inquirer/prompts": "^5.4.0",
8484
"@types/yargs": "^17.0.33",
8585
"chalk": "^5.3.0",

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igniteui/cli-core",
3-
"version": "14.3.0",
3+
"version": "14.3.1-beta.1",
44
"description": "Base types and functionality for Ignite UI CLI",
55
"repository": {
66
"type": "git",

‎packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,15 @@ jobs:
3232
- run: npm i # replace with 'npm ci' after committing lock file from first install
3333
- name: Set project name
3434
run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
35-
- name: Determine if project is standalone and set build path
36-
run: |
37-
if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
38-
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
39-
else
40-
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
41-
fi
4235
- name: Build project with dynamic base-href
4336
run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
4437
- name: Update Resource Paths
45-
run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
38+
run: find ./dist/${{ env.PROJECT_NAME }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
4639
- name: SPA routing handling
47-
run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
40+
run: cp ./dist/${{ env.PROJECT_NAME }}/index.html ./dist/${{ env.PROJECT_NAME }}/404.html
4841
- name: Upload build artifact to GitHub Pages
4942
uses: actions/upload-pages-artifact@v1
5043
with:
51-
path: ${{ env.BUILD_PATH }}
44+
path: ./dist/${{ env.PROJECT_NAME }}
5245
- name: Deploy to GitHub Pages
5346
uses: actions/deploy-pages@v1

‎packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@
2424
"minireset.css": "~0.0.7",
2525
"rxjs": "~7.8.0",
2626
"tslib": "~2.3.0",
27-
"zone.js": "~0.14.3"
27+
"zone.js": "~0.15.0"
28+
},
29+
"overrides": {
30+
"igniteui-angular-charts": {
31+
"@angular/core": "^19.0.0",
32+
"@angular/common": "^19.0.0",
33+
"@angular/compiler": "^19.0.0"
34+
}
2835
},
2936
"devDependencies": {
3037
"@angular-devkit/build-angular": "~19.0.0",

‎packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,15 @@ jobs:
3232
- run: npm i # replace with 'npm ci' after committing lock file from first install
3333
- name: Set project name
3434
run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
35-
- name: Determine if project is standalone and set build path
36-
run: |
37-
if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
38-
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
39-
else
40-
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
41-
fi
4235
- name: Build project with dynamic base-href
4336
run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
4437
- name: Update Resource Paths
45-
run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
38+
run: find ./dist/${{ env.PROJECT_NAME }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
4639
- name: SPA routing handling
47-
run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
40+
run: cp ./dist/${{ env.PROJECT_NAME }}/index.html ./dist/${{ env.PROJECT_NAME }}/404.html
4841
- name: Upload build artifact to GitHub Pages
4942
uses: actions/upload-pages-artifact@v1
5043
with:
51-
path: ${{ env.BUILD_PATH }}
44+
path: ./dist/${{ env.PROJECT_NAME }}
5245
- name: Deploy to GitHub Pages
5346
uses: actions/deploy-pages@v1

‎packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github-pages.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,15 @@ jobs:
3232
- run: npm i # replace with 'npm ci' after committing lock file from first install
3333
- name: Set project name
3434
run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
35-
- name: Determine if project is standalone and set build path
36-
run: |
37-
if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
38-
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
39-
else
40-
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
41-
fi
4235
- name: Build project with dynamic base-href
4336
run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
4437
- name: Update Resource Paths
45-
run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
38+
run: find ./dist/${{ env.PROJECT_NAME }}/browser -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
4639
- name: SPA routing handling
47-
run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
40+
run: cp ./dist/${{ env.PROJECT_NAME }}/browser/index.html ./dist/${{ env.PROJECT_NAME }}/browser/404.html
4841
- name: Upload build artifact to GitHub Pages
4942
uses: actions/upload-pages-artifact@v1
5043
with:
51-
path: ${{ env.BUILD_PATH }}
44+
path: ./dist/${{ env.PROJECT_NAME }}/browser
5245
- name: Deploy to GitHub Pages
5346
uses: actions/deploy-pages@v1

‎packages/igx-templates/igx-ts/projects/_base/files/package.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
"tslib": "~2.3.0",
2727
"zone.js": "~0.15.0"
2828
},
29+
"overrides": {
30+
"igniteui-angular-charts": {
31+
"@angular/core": "^19.0.0",
32+
"@angular/common": "^19.0.0",
33+
"@angular/compiler": "^19.0.0"
34+
}
35+
},
2936
"devDependencies": {
3037
"@angular-devkit/build-angular": "~19.0.0",
3138
"@angular-eslint/builder": "~19.0.0-alpha.1",

‎packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,15 @@ jobs:
3232
- run: npm i # replace with 'npm ci' after committing lock file from first install
3333
- name: Set project name
3434
run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
35-
- name: Determine if project is standalone and set build path
36-
run: |
37-
if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
38-
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
39-
else
40-
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
41-
fi
4235
- name: Build project with dynamic base-href
4336
run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
4437
- name: Update Resource Paths
45-
run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
38+
run: find ./dist/${{ env.PROJECT_NAME }}/browser -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
4639
- name: SPA routing handling
47-
run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
40+
run: cp ./dist/${{ env.PROJECT_NAME }}/browser/index.html ./dist/${{ env.PROJECT_NAME }}/browser/404.html
4841
- name: Upload build artifact to GitHub Pages
4942
uses: actions/upload-pages-artifact@v1
5043
with:
51-
path: ${{ env.BUILD_PATH }}
44+
path: ./dist/${{ env.PROJECT_NAME }}/browser
5245
- name: Deploy to GitHub Pages
5346
uses: actions/deploy-pages@v1

‎packages/igx-templates/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igniteui/angular-templates",
3-
"version": "19.0.1430",
3+
"version": "19.0.1431-beta.1",
44
"description": "Templates for Ignite UI for Angular projects and components",
55
"repository": {
66
"type": "git",
@@ -12,7 +12,7 @@
1212
"author": "Infragistics",
1313
"license": "MIT",
1414
"dependencies": {
15-
"@igniteui/cli-core": "~14.3.0",
15+
"@igniteui/cli-core": "~14.3.1-beta.1",
1616
"typescript": "~5.5.4"
1717
}
1818
}

‎packages/ng-schematics/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igniteui/angular-schematics",
3-
"version": "19.0.1430",
3+
"version": "19.0.1431-beta.1",
44
"description": "Ignite UI for Angular Schematics for ng new and ng generate",
55
"repository": {
66
"type": "git",
@@ -20,8 +20,8 @@
2020
"dependencies": {
2121
"@angular-devkit/core": "^19.0.0",
2222
"@angular-devkit/schematics": "^19.0.0",
23-
"@igniteui/angular-templates": "~19.0.1430",
24-
"@igniteui/cli-core": "~14.3.0",
23+
"@igniteui/angular-templates": "~19.0.1431-beta.1",
24+
"@igniteui/cli-core": "~14.3.1-beta.1",
2525
"@schematics/angular": "~19.0.0",
2626
"rxjs": "^7.8.1"
2727
},

0 commit comments

Comments
 (0)