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

chore(deps): Migrate to lerna v7 #796

Merged
merged 4 commits into from
Oct 19, 2023
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
5 changes: 2 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,5 @@ jobs:
- name: build and publish
run: |
npm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
npm version --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
lerna version --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
lerna exec -- npm publish --access public --ignore-scripts --tag=unstable 2>&1
npm version --workspaces --include-workspace-root --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
npm publish --workspaces --access public --tag=unstable 2>&1
5 changes: 2 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ jobs:
- name: build and publish
run: |
npm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
npm version --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
lerna version --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
lerna exec -- npm publish --access public ${{ steps.tag.outputs.tag }} 2>&1
npm version --workspaces --include-workspace-root --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
npm publish --workspaces --access public ${{ steps.tag.outputs.tag }} 2>&1

- name: Create PR to increment version
uses: peter-evans/create-pull-request@v3
Expand Down
26 changes: 12 additions & 14 deletions DEVELOPERS.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
# Cicero Development Guide
# Template Archive Development Guide

## ❗ Accord Project Development Guide ❗
We'd love for you to help develop improvements to Cicero technology! Please refer to the [Accord Project Development guidelines][apdev] we'd like you to follow.
We'd love for you to help develop improvements to Template Archive technology! Please refer to the [Accord Project Development guidelines][apdev] we'd like you to follow.

## Cicero Specific Information
## Template Archive Specific Information

### Development Setup

#### Building Cicero
#### Building Template Archive

To build Cicero, you clone the source code repository and use lerna to build:
To build Template Archive, you clone the source code repository and use npm to build:

```shell
# Clone your Github repository:
git clone https://github.com/<GITHUB_USERNAME>/cicero.git
git clone https://github.com/<GITHUB_USERNAME>/template-archive.git

# Go to the Cicero directory:
cd cicero
# Go to the Template Archive directory:
cd template-archive

# Add the main Cicero repository as an upstream remote to your repository:
git remote add upstream "https://github.com/accordproject/cicero.git"

# Install node.js dependencies:
npm install -g lerna
lerna bootstrap
# Add the main Template Archive repository as an upstream remote to your repository:
git remote add upstream "https://github.com/accordproject/template-archive.git"
```

**Note:** Template Archive no longer uses `lerna bootstrap`, since `lerna bootstrap` was deprecated at lerne version 7.x. Now `npm install` automatically resolves packages defined within the "Workspaces" definition inside `package.json`.

[apdev]: https://github.com/accordproject/techdocs/blob/master/DEVELOPERS.md
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Using Cicero you can take any existing natural language text (typically a clause

## Structure of the Code Repository

Top level repository (cicero), with sub packages. Each sub-package is published as an independent npm module using `lerna`:
Top level repository (cicero), with sub packages. Each sub-package is published as an independent npm module managed as npm packages:
* [cicero-cli](https://github.com/accordproject/cicero/tree/master/packages/cicero-cli) : Command line interface (for parsing, execution, creating archives) for Accord Project legal templates
* [cicero-core](https://github.com/accordproject/cicero/tree/master/packages/cicero-core) : Core classes to manage the grammar, models and logic of Accord Project legal templates
* [cicero-tools](https://github.com/accordproject/cicero/tree/master/packages/cicero-tools) : Tools for generating code (UML, Java, etc.) from Accord Project legal templates
Expand Down
3 changes: 3 additions & 0 deletions config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"version": "0.24.0"
}
8 changes: 0 additions & 8 deletions lerna.json

This file was deleted.

2 changes: 1 addition & 1 deletion license.config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"license": "../../HEADER",
"license": "HEADER",
"ignore": [
".git",
".github",
Expand Down
Loading
Loading