Skip to content

chore: use npm workspaces to manage locking dependencies #3275

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

Closed
wants to merge 12 commits into from
Closed

chore: use npm workspaces to manage locking dependencies #3275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d3e1e35
chore: use npm workspaces to manage locking dependencies
ChristianMurphy Aug 11, 2021
60619a0
ci: update github actions to run install once at top level
ChristianMurphy Aug 11, 2021
406bbbb
ci: update node version used in ci/cd
ChristianMurphy Aug 11, 2021
d21e80a
ci: add npm caching
ChristianMurphy Aug 11, 2021
8693b4f
chore: update remark validate links to latest
ChristianMurphy Aug 11, 2021
e60a9d3
ci: install only depedency folders needed for ci job
ChristianMurphy Aug 11, 2021
3dad185
Merge branch 'develop' into npm-workspace
ChristianMurphy Aug 16, 2021
828c729
ci: revert change to only install frontend for storybook
ChristianMurphy Aug 16, 2021
c2f2c91
build: deduplicate runtypes versions
ChristianMurphy Aug 17, 2021
3f2ee98
ci: update build spec
ChristianMurphy Aug 17, 2021
ff5be15
build: remove install script from com.equella.core/build.sbt
ChristianMurphy Aug 17, 2021
cd142ee
build: remove extra scala npm install steps
ChristianMurphy Aug 17, 2021
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
30 changes: 12 additions & 18 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,24 +58,15 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: "${{ steps.nvm.outputs.NVMRC }}"
cache: npm

- name: Set up JDK 1.8
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 8

- name: Install node dependencies (core)
working-directory: react-front-end
run: |
npm ci

- name: Install node dependencies (IntegTester)
working-directory: autotest/IntegTester/ps
run: |
npm ci

- name: Install node dependencies (root)
- name: Install node dependencies (all)
run: |
npm ci

Expand All @@ -99,12 +90,12 @@ jobs:
- name: Run unit tests (javascript)
working-directory: react-front-end
run: |
npm cit
npm t

- name: Run unit tests (javascript - legacy)
working-directory: Source/Plugins/Core/com.equella.core/test/javascript
run: |
npm cit
npm t

- name: Build primary artefacts
run: |
Expand Down Expand Up @@ -147,9 +138,9 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: "${{ steps.nvm.outputs.NVMRC }}"
cache: npm

- name: Install node dependencies (core)
working-directory: react-front-end
- name: Install node dependencies (react-front-end)
run: |
npm ci

Expand Down Expand Up @@ -396,11 +387,16 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: "${{ steps.nvm.outputs.NVMRC }}"
cache: npm

- name: Install node dependencies (oeq-ts-rest-api)
run: |
npm ci --workspace=oeq-ts-rest-api

- name: Run tests
working-directory: oeq-ts-rest-api
run: |
npm cit
npm t
Comment on lines 396 to +399
Copy link
Member Author

@ChristianMurphy ChristianMurphy Aug 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could be changed to

      - name: Run tests
        run: |
          npm t --workspace=oeq-ts-rest-api

if preferred

Copy link
Contributor

@PenghaiZhang PenghaiZhang Aug 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer leave as it is.


- name: Stop oEQ
if: failure()
Expand All @@ -414,5 +410,3 @@ jobs:
with:
name: oEQ-logs-rest-module
path: autotest/equella-install/logs


2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.5.0
16.6.1
1 change: 0 additions & 1 deletion Source/Plugins/Core/com.equella.core/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ Compile / resourceGenerators += Def.task {

Compile / resourceGenerators += Def.task {
val baseSwagger = baseDirectory.value / "swaggerui"
Common.nodeInstall(baseSwagger)
Copy link
Member Author

@ChristianMurphy ChristianMurphy Aug 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alternatively this could cd to the top level and run the install again there.

Common.nodeScript("build", baseSwagger)
val outDir = (Compile / resourceManaged).value / "web/apidocs"
val bundle = baseSwagger / "target/bundle.js"
Expand Down
Loading