From 2d846b436c705a8bfb2bbf0790943364f4388c65 Mon Sep 17 00:00:00 2001 From: Jonathan Breedlove Date: Tue, 17 Sep 2024 15:32:18 -0700 Subject: [PATCH 1/2] Add build tasks for Node packages to Maven build --- plugin/.classpath | 96 ++++++++++++++++++++++++----------------------- plugin/pom.xml | 36 ++++++++++++++++++ 2 files changed, 86 insertions(+), 46 deletions(-) diff --git a/plugin/.classpath b/plugin/.classpath index b141d6da..ea6c81c8 100644 --- a/plugin/.classpath +++ b/plugin/.classpath @@ -1,6 +1,10 @@ - + + + + + @@ -21,50 +25,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugin/pom.xml b/plugin/pom.xml index f223ea18..f59cd2c5 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -240,6 +240,42 @@ + + org.codehaus.mojo + exec-maven-plugin + 3.4.0 + + + build-toolkit-ui + generate-resources + + exec + + + npm + + run + build-ui + + ${project.basedir}/webview + + + + install-auth-module + generate-resources + + exec + + + npm + + install + + ${project.basedir}/auth + + + + From 3095256c9fcfe8f5fea0032c77bca4a65ab6276a Mon Sep 17 00:00:00 2001 From: Jonathan Breedlove Date: Tue, 17 Sep 2024 15:38:41 -0700 Subject: [PATCH 2/2] Remove explicit NPM actions from CI build task --- .github/workflows/maven.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 23537e82..fcd0fd1e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,14 +21,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install auth module - run: | - cd plugin/auth - npm install - - name: Build login webview - run: | - cd plugin/webview - npm run build-ui - name: Setup Maven Action uses: s4u/setup-maven-action@v1.14.0 with: