From f1b3c4ab1c3ba2a8111a0c242e0244a50aedeea3 Mon Sep 17 00:00:00 2001 From: Vladislav Sehtman <59738533+vlad961@users.noreply.github.com> Date: Mon, 13 Jun 2022 14:40:46 +0200 Subject: [PATCH 1/4] Update build-and-deploy.yml Added devonfw/journeys scripts and build steps. --- .github/workflows/build-and-deploy.yml | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 869fbebf4ad..663038cd94c 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -59,6 +59,22 @@ jobs: run: | chmod +x wiki-tutorials/scripts/copyPomFiles.sh wiki-tutorials/scripts/copyPomFiles.sh + + - name: Copy pom files for journeys + run: | + node journeys/scripts/copyPomFiles.js + + - name: install for Journeys/app + run: | + cd journeys/app + npm install + cd ../../ + + - name: npm install for Journey/scripts + run: | + cd journeys/scripts + npm install + cd ../../ - name: npm install for solutions run: | @@ -154,6 +170,16 @@ jobs: run: | cp -avr wiki-tutorials/target/generated-docs/ target/generated-docs/website/pages/learning/ + - name: Create output for journeys + run: | + chmod +x journeys/scripts/createOutput.sh + journeys/scripts/createOutput.sh + + - name: Copy output of journeys + run: | + cp -avr journeys/target/generated-docs/ target/generated-docs/website/pages/journeys/ + mv target/generated-docs/website/pages/journeys/journeys target/generated-docs/website/pages/journeys/journey + - name: Create JSONs for journeys run: | node journeys/scripts/createJourneyJsons.js target/generated-docs/website/pages/journey_content/ @@ -162,6 +188,12 @@ jobs: run: | cp -avr journeys/app target/generated-docs/website/pages/journeys/ + - name: ng build for journeys + run: | + cd journeys/app + ng build --base-href /website/pages/journeys + cp /dist/devon4ng-matlayout/. target/generated-docs/website/pages/journeys/ + - name: Build and test search engine run: | cd website/components/header/search-engine From 3aa44813cf9c982000d57f73d6a6184f5b4c9de8 Mon Sep 17 00:00:00 2001 From: Vladislav Sehtman <59738533+vlad961@users.noreply.github.com> Date: Mon, 13 Jun 2022 14:43:21 +0200 Subject: [PATCH 2/4] Update build-and-deploy.yml refactored the inserted sctructure of commands --- .github/workflows/build-and-deploy.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 663038cd94c..922a18395f2 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -64,30 +64,30 @@ jobs: run: | node journeys/scripts/copyPomFiles.js - - name: install for Journeys/app + - name: npm install for solutions run: | - cd journeys/app + cd solutions/scripts npm install cd ../../ - - name: npm install for Journey/scripts + - name: npm install for tutorials run: | - cd journeys/scripts + cd wiki-tutorials/scripts npm install cd ../../ - - - name: npm install for solutions + + - name: install for Journeys/app run: | - cd solutions/scripts + cd journeys/app npm install cd ../../ - - name: npm install for tutorials + - name: npm install for Journey/scripts run: | - cd wiki-tutorials/scripts + cd journeys/scripts npm install cd ../../ - + - name: Fix includes of solutions run: | node solutions/scripts/fixIncludeFiles.js ./solutions/solutions/ ./solutions/includes/ From d9f5b95e81c3b26db0aa786452902ee67aae05d4 Mon Sep 17 00:00:00 2001 From: Vladislav Sehtman <59738533+vlad961@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:52:37 +0200 Subject: [PATCH 3/4] Update build-and-deploy.yml Name of npm install step refactored. Changed order of build-and-deploy steps. Npm install first, afterwards the scripts are run. Adjusted the Create output for journeys step to save the json outputfiles in the journes/target/ directory. The Copy output of journeys step is therefore needed now. --- .github/workflows/build-and-deploy.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 922a18395f2..5cb71ceda6e 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -60,6 +60,12 @@ jobs: chmod +x wiki-tutorials/scripts/copyPomFiles.sh wiki-tutorials/scripts/copyPomFiles.sh + - name: npm install for Journey/scripts + run: | + cd journeys/scripts + npm install + cd ../../ + - name: Copy pom files for journeys run: | node journeys/scripts/copyPomFiles.js @@ -76,18 +82,12 @@ jobs: npm install cd ../../ - - name: install for Journeys/app + - name: npm install for Journeys/app run: | cd journeys/app npm install cd ../../ - - name: npm install for Journey/scripts - run: | - cd journeys/scripts - npm install - cd ../../ - - name: Fix includes of solutions run: | node solutions/scripts/fixIncludeFiles.js ./solutions/solutions/ ./solutions/includes/ @@ -174,7 +174,7 @@ jobs: run: | chmod +x journeys/scripts/createOutput.sh journeys/scripts/createOutput.sh - + - name: Copy output of journeys run: | cp -avr journeys/target/generated-docs/ target/generated-docs/website/pages/journeys/ From cc47710f878a83413874f3086e602912843e33f8 Mon Sep 17 00:00:00 2001 From: Vladislav Sehtman <59738533+vlad961@users.noreply.github.com> Date: Tue, 21 Jun 2022 09:02:39 +0200 Subject: [PATCH 4/4] Refacotring of build-and-deploy.yml Delete unnecessary mv cmd. --- .github/workflows/build-and-deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 5cb71ceda6e..d19c459606d 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -178,7 +178,6 @@ jobs: - name: Copy output of journeys run: | cp -avr journeys/target/generated-docs/ target/generated-docs/website/pages/journeys/ - mv target/generated-docs/website/pages/journeys/journeys target/generated-docs/website/pages/journeys/journey - name: Create JSONs for journeys run: |