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.

Sign up for GitHub

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

Remove build step from angular github pages yaml files #1348

Merged
merged 6 commits into from
Nov 27, 2024
Merged

Remove build step from angular github pages yaml files #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d22c28c
fix(cli): remove build step from github pages
Nov 25, 2024
e4d2f44
add overrides for templates
Nov 26, 2024
0086812
chore: release 14.3.1-beta.0
Nov 26, 2024
09ef47c
chore: update zone.js for ng modules
Lipata Nov 26, 2024
e1b783f
chore: release 14.3.1-beta.1
Nov 26, 2024
1c8a3fe
Merge branch 'hhristov/remove-build-step-from-github-pages' of https:…
Nov 26, 2024
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
6 changes: 3 additions & 3 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igniteui-cli",
"version": "14.3.0",
"version": "14.3.1-beta.1",
"description": "CLI tool for creating Ignite UI projects",
"keywords": [
"CLI",
Expand Down Expand Up @@ -78,8 +78,8 @@
"all": true
},
"dependencies": {
"@igniteui/angular-templates": "~19.0.1430",
"@igniteui/cli-core": "~14.3.0",
"@igniteui/angular-templates": "~19.0.1431-beta.1",
"@igniteui/cli-core": "~14.3.1-beta.1",
"@inquirer/prompts": "^5.4.0",
"@types/yargs": "^17.0.33",
"chalk": "^5.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/cli-core",
"version": "14.3.0",
"version": "14.3.1-beta.1",
"description": "Base types and functionality for Ignite UI CLI",
"repository": {
"type": "git",
Expand Down
13 changes: 3 additions & 10 deletions ...igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,15 @@ jobs:
- run: npm i # replace with 'npm ci' after committing lock file from first install
- name: Set project name
run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
- name: Determine if project is standalone and set build path
run: |
if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
else
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
fi
- name: Build project with dynamic base-href
run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
- name: Update Resource Paths
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" {} +
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" {} +
- name: SPA routing handling
run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
run: cp ./dist/${{ env.PROJECT_NAME }}/index.html ./dist/${{ env.PROJECT_NAME }}/404.html
- name: Upload build artifact to GitHub Pages
uses: actions/upload-pages-artifact@v1
with:
path: ${{ env.BUILD_PATH }}
path: ./dist/${{ env.PROJECT_NAME }}
- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v1
9 changes: 8 additions & 1 deletion packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@
"minireset.css": "~0.0.7",
"rxjs": "~7.8.0",
"tslib": "~2.3.0",
"zone.js": "~0.14.3"
"zone.js": "~0.15.0"
},
"overrides": {
"igniteui-angular-charts": {
"@angular/core": "^19.0.0",
"@angular/common": "^19.0.0",
"@angular/compiler": "^19.0.0"
}
},
"devDependencies": {
"@angular-devkit/build-angular": "~19.0.0",
Expand Down
13 changes: 3 additions & 10 deletions ...tes/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,15 @@ jobs:
- run: npm i # replace with 'npm ci' after committing lock file from first install
- name: Set project name
run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
- name: Determine if project is standalone and set build path
run: |
if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
else
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
fi
- name: Build project with dynamic base-href
run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
- name: Update Resource Paths
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" {} +
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" {} +
- name: SPA routing handling
run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
run: cp ./dist/${{ env.PROJECT_NAME }}/index.html ./dist/${{ env.PROJECT_NAME }}/404.html
- name: Upload build artifact to GitHub Pages
uses: actions/upload-pages-artifact@v1
with:
path: ${{ env.BUILD_PATH }}
path: ./dist/${{ env.PROJECT_NAME }}
- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v1
13 changes: 3 additions & 10 deletions packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,15 @@ jobs:
- run: npm i # replace with 'npm ci' after committing lock file from first install
- name: Set project name
run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
- name: Determine if project is standalone and set build path
run: |
if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
else
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
fi
- name: Build project with dynamic base-href
run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
- name: Update Resource Paths
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" {} +
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" {} +
- name: SPA routing handling
run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
run: cp ./dist/${{ env.PROJECT_NAME }}/browser/index.html ./dist/${{ env.PROJECT_NAME }}/browser/404.html
- name: Upload build artifact to GitHub Pages
uses: actions/upload-pages-artifact@v1
with:
path: ${{ env.BUILD_PATH }}
path: ./dist/${{ env.PROJECT_NAME }}/browser
- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v1
7 changes: 7 additions & 0 deletions packages/igx-templates/igx-ts/projects/_base/files/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
"tslib": "~2.3.0",
"zone.js": "~0.15.0"
},
"overrides": {
"igniteui-angular-charts": {
"@angular/core": "^19.0.0",
"@angular/common": "^19.0.0",
"@angular/compiler": "^19.0.0"
}
},
"devDependencies": {
"@angular-devkit/build-angular": "~19.0.0",
"@angular-eslint/builder": "~19.0.0-alpha.1",
Expand Down
13 changes: 3 additions & 10 deletions ...-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,15 @@ jobs:
- run: npm i # replace with 'npm ci' after committing lock file from first install
- name: Set project name
run: echo "PROJECT_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
- name: Determine if project is standalone and set build path
run: |
if jq -e ".projects[\"${{ env.PROJECT_NAME }}\"].architect.build.builder == \"@angular-devkit/build-angular:application\"" angular.json > /dev/null; then
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}/browser" >> $GITHUB_ENV
else
echo "BUILD_PATH=./dist/${{ env.PROJECT_NAME }}" >> $GITHUB_ENV
fi
- name: Build project with dynamic base-href
run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
- name: Update Resource Paths
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" {} +
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" {} +
- name: SPA routing handling
run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
run: cp ./dist/${{ env.PROJECT_NAME }}/browser/index.html ./dist/${{ env.PROJECT_NAME }}/browser/404.html
- name: Upload build artifact to GitHub Pages
uses: actions/upload-pages-artifact@v1
with:
path: ${{ env.BUILD_PATH }}
path: ./dist/${{ env.PROJECT_NAME }}/browser
- name: Deploy to GitHub Pages
uses: actions/deploy-pages@v1
4 changes: 2 additions & 2 deletions packages/igx-templates/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/angular-templates",
"version": "19.0.1430",
"version": "19.0.1431-beta.1",
"description": "Templates for Ignite UI for Angular projects and components",
"repository": {
"type": "git",
Expand All @@ -12,7 +12,7 @@
"author": "Infragistics",
"license": "MIT",
"dependencies": {
"@igniteui/cli-core": "~14.3.0",
"@igniteui/cli-core": "~14.3.1-beta.1",
"typescript": "~5.5.4"
}
}
6 changes: 3 additions & 3 deletions packages/ng-schematics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/angular-schematics",
"version": "19.0.1430",
"version": "19.0.1431-beta.1",
"description": "Ignite UI for Angular Schematics for ng new and ng generate",
"repository": {
"type": "git",
Expand All @@ -20,8 +20,8 @@
"dependencies": {
"@angular-devkit/core": "^19.0.0",
"@angular-devkit/schematics": "^19.0.0",
"@igniteui/angular-templates": "~19.0.1430",
"@igniteui/cli-core": "~14.3.0",
"@igniteui/angular-templates": "~19.0.1431-beta.1",
"@igniteui/cli-core": "~14.3.1-beta.1",
"@schematics/angular": "~19.0.0",
"rxjs": "^7.8.1"
},
Expand Down
Loading