Skip to content

Commit

Permalink
ci: improve release
Browse files Browse the repository at this point in the history
  • Loading branch information
Badisi committed Jul 4, 2024
1 parent 4f51b94 commit c4ea7ab
Show file tree
Hide file tree
Showing 21 changed files with 270 additions and 205 deletions.
51 changes: 0 additions & 51 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,54 +46,3 @@ jobs:
working-directory: 'projects/${{ inputs.package }}'
dry-run: ${{ inputs.dry-run }}
release: true

ci_sync_peer_deps:
needs: ci_release
runs-on: 'ubuntu-latest'
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }} # https://github.com/actions/checkout/issues/1327
persist-credentials: false # https://github.com/semantic-release/semantic-release/issues/2636

- name: Synchronize peer dependencies
working-directory: 'scripts'
env:
GITHUB_TOKEN: ${{ secrets.DSI_HUG_BOT_GITHUB_TOKEN }}
run: |
git config user.name 'dsi-hug-bot'
git config user.email '[email protected]'
git remote set-url origin https://x-access-token:${{ secrets.DSI_HUG_BOT_GITHUB_TOKEN }}@github.com/${{ github.repository }}
npm --prefix . i chalk
node ./sync-peer-deps.mjs
#
# nx does not update package-lock file correctly.
# @see https://github.com/nrwl/nx/issues/26660
#
# This results in the following error, next time deps are installed:
# “npm error `npm ci` can only install packages when your package.json and package-lock.json or
# npm-shrinkwrap.json are in sync. Please update your lock file with `npm install` before continuing."
#
ci_update_package_lock_file:
needs: ci_sync_peer_deps
runs-on: 'ubuntu-latest'
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }} # https://github.com/actions/checkout/issues/1327
persist-credentials: false # https://github.com/semantic-release/semantic-release/issues/2636

- name: Synchronize package.json and package-lock.json
env:
GITHUB_TOKEN: ${{ secrets.DSI_HUG_BOT_GITHUB_TOKEN }}
run: |
git config user.name 'dsi-hug-bot'
git config user.email '[email protected]'
git remote set-url origin https://x-access-token:${{ secrets.DSI_HUG_BOT_GITHUB_TOKEN }}@github.com/${{ github.repository }}
npm install
git add package.json package-lock.json
git commit --message "chore: synchronize package.json and package-lock.json"
git push --follow-tags --no-verify --atomic
11 changes: 0 additions & 11 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,10 @@
"dependsOn": [
"^build:ng"
]
},
"nx-release-publish": {
"dependsOn": [
"build"
],
"options": {
"packageRoot": "{workspaceRoot}/dist/{projectRoot}"
}
}
},
"release": {
"projectsRelationship": "independent",
"git": {
"commitMessage": "chore({projectName}): release version {version} [skip ci]"
},
"version": {
"conventionalCommits": true
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lint": "eslint . --fix",
"prepare": "husky || true",
"new-package": "ng g .:new-package",
"release:dry-run": "nx release --verbose --dry-run",
"release:dry-run": "node -r @swc-node/register ./scripts/release.ts --verbose --dry-run",
"postinstall": "patch-package"
},
"workspaces": [
Expand Down
4 changes: 2 additions & 2 deletions projects/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"test:ci": "ng test core --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build core -c=production",
"build": "nx build:ng @hug/ngx-core --verbose",
"release": "nx release -p=@hug/ngx-core --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-core --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-core --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/layout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test layout --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build layout -c=production",
"build": "nx build:ng @hug/ngx-layout --verbose",
"release": "nx release -p=@hug/ngx-layout --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-layout --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-layout --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/list-loader/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"test:ci": "ng test list-loader --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build list-loader -c=production",
"build": "nx build:ng @hug/ngx-list-loader --verbose",
"release": "nx release -p=@hug/ngx-list-loader --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-list-loader --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-list-loader --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/message-box-dialog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test message-box-dialog --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build message-box-dialog -c=production",
"build": "nx build:ng @hug/ngx-message-box-dialog --verbose",
"release": "nx release -p=@hug/ngx-message-box-dialog --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-message-box-dialog --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-message-box-dialog --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/message-box/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"test:ci": "ng test message-box --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build message-box -c=production",
"build": "nx build:ng @hug/ngx-message-box --verbose",
"release": "nx release -p=@hug/ngx-message-box --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-message-box --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-message-box --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/numeric-stepper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"test:ci": "ng test numeric-stepper --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build numeric-stepper -c=production",
"build": "nx build:ng @hug/ngx-numeric-stepper --verbose",
"release": "nx release -p=@hug/ngx-numeric-stepper --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-numeric-stepper --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-numeric-stepper --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/overlay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test overlay --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build overlay -c=production",
"build": "nx build:ng @hug/ngx-overlay --verbose",
"release": "nx release -p=@hug/ngx-overlay --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-overlay --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-overlay --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/search-container/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test search-container --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build search-container -c=production",
"build": "nx build:ng @hug/ngx-search-container --verbose",
"release": "nx release -p=@hug/ngx-search-container --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-search-container --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-search-container --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/sidenav/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test sidenav --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build sidenav -c=production",
"build": "nx build:ng @hug/ngx-sidenav --verbose",
"release": "nx release -p=@hug/ngx-sidenav --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-sidenav --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-sidenav --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/snackbar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test snackbar --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build snackbar -c=production",
"build": "nx build:ng @hug/ngx-snackbar --verbose",
"release": "nx release -p=@hug/ngx-snackbar --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-snackbar --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-snackbar --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/splitter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"test:ci": "ng test splitter --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build splitter -c=production",
"build": "nx build:ng @hug/ngx-splitter --verbose",
"release": "nx release -p=@hug/ngx-splitter --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-splitter --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-splitter --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/status/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"test:ci": "ng test status --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build status -c=production",
"build": "nx build:ng @hug/ngx-status --verbose",
"release": "nx release -p=@hug/ngx-status --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-status --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-status --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/time-picker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test time-picker --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build time-picker -c=production",
"build": "nx build:ng @hug/ngx-time-picker --verbose",
"release": "nx release -p=@hug/ngx-time-picker --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-time-picker --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-time-picker --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/tooltip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test tooltip --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build tooltip -c=production",
"build": "nx build:ng @hug/ngx-tooltip --verbose",
"release": "nx release -p=@hug/ngx-tooltip --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-tooltip --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-tooltip --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/user-card/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test user-card --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build user-card -c=production",
"build": "nx build:ng @hug/ngx-user-card --verbose",
"release": "nx release -p=@hug/ngx-user-card --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-user-card --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-user-card --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
4 changes: 2 additions & 2 deletions projects/user-tooltip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"test:ci": "ng test user-tooltip --watch=false --browsers=ChromeHeadless",
"build:ng": "ng build user-tooltip -c=production",
"build": "nx build:ng @hug/ngx-user-tooltip --verbose",
"release": "nx release -p=@hug/ngx-user-tooltip --yes --verbose",
"release:dry-run": "nx release -p=@hug/ngx-user-tooltip --verbose --dry-run"
"release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-user-tooltip --verbose",
"release:dry-run": "npm run release -- --dry-run"
},
"peerDependencies": {
"@angular/common": ">= 14",
Expand Down
Loading

0 comments on commit c4ea7ab

Please sign in to comment.