From b97bc5211dadb4308af5555d6ceb33440504c2c1 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 14:38:49 +0100 Subject: [PATCH 01/16] Create publishTutorials.sh --- publishTutorials.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 publishTutorials.sh diff --git a/publishTutorials.sh b/publishTutorials.sh new file mode 100644 index 0000000..13139f2 --- /dev/null +++ b/publishTutorials.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# start after the folder playbooks is created in the current repository +cd playbooks +SPECIFIED_TUTORIALS=() +for dir in */; do SPECIFIED_TUTORIALS+=("${dir::-1}"); done +echo "SPECIFIED_TUTORIALS:\n" +printf "%s\n" "${SPECIFIED_TUTORIALS[@]}" +# switches to tutorials repository https://github.com/devonfw-tutorials/tutorials +cd ../repo/tutorials +ONLINE_TUTORIALS=() +for dir in */; do ONLINE_TUTORIALS+=("${dir::-1}"); done +echo "ONLINE_TUTORIALS:\n" +printf "%s\n" "${ONLINE_TUTORIALS[@]}" + +# delete tutorials, which are not specified anymore +for tutorial in "${ONLINE_TUTORIALS[@]}" +do + if [[ ! " ${SPECIFIED_TUTORIALS[@]} " =~ " ${tutorial} " ]]; then + rm -rf "${tutorial}" + echo "deleted ${tutorial} as not specified anymore in tutorials repository" + fi +done + +# switches to tutorials compiler repository https://github.com/devonfw-tutorials/tutorial-compiler (build/output/wiki) +cd ../build/output/wiki +GENERATED_TUTORIALS=() +for dir in */; do GENERATED_TUTORIALS+=("${dir::-1}"); done +echo "GENERATED_TUTORIALS:\n" +printf "%s\n" "${GENERATED_TUTORIALS[@]}" +# back to tutorials compiler repository +cd ../../.. + +# delete tutorials, which are newly generated +for tutorial in "${ONLINE_TUTORIALS[@]}" +do + if [[ ! " ${GENERATED_TUTORIALS[@]} " =~ " ${tutorial} " ]]; then + rm -rf repo/"${tutorial}" + echo "deleted ${tutorial} as this is up to be replaced by the build" + fi +done + +mkdir -p tutorials +#copy all files from * in repo/tutorials (https://github.com/devonfw-tutorials/wiki-tutorials/tutorials) +cp -r build/output/wiki/*/ repo/tutorials +cd repo/ +git add -A +git config user.email "devonfw" +git config user.name "devonfw" +git commit -m "Updated tutorials" +git pull --rebase origin/master +git push From 968df6cc0d8706add63eff1bd716baa503099003 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 14:39:32 +0100 Subject: [PATCH 02/16] Create main.yml --- .github/workflows/main.yml | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..e88e175 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,60 @@ +name: CI + +on: + repository_dispatch: + types: [dispatch-katacoda-scenarios] + + workflow_dispatch: +jobs: + build: + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: choose random polling time + id: randompoll + uses: ddradar/choose-random-action@v1.0.5 + with: + contents: | + 1 + 3 + 5 + 9 + 13 + + - name: Wait for parallel workflows to finish + uses: softprops/turnstyle@v0.1.5 + with: + poll-interval-seconds: ${{ steps.randompoll.outputs.selected }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Checkout tutorial-compiler + uses: actions/checkout@v2 + with: + repository: devonfw-tutorials/tutorial-compiler + + - name: Checkout playbooks + uses: actions/checkout@v2 + with: + repository: devonfw-tutorials/tutorials + path: playbooks + + - uses: actions/setup-node@v2-beta + + - name: install TS + run: npm install typescript + + - name: npm install + run: npm install + + - name: run buildRun.sh + run: sh buildRun.sh -e wiki_eclipse -e wiki_vscode -p ${{ github.event.client_payload.tutorial }} + + - name: Checkout + uses: actions/checkout@v2 + with: + path: repo + + - name: publish tutorials + run: bash repo/publishTutorials.sh From 52acefe1bf3cc52a072cf37fab8521faffbf92ef Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 14:39:54 +0100 Subject: [PATCH 03/16] Create nightBuild.yml --- .github/workflows/nightBuild.yml | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/nightBuild.yml diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml new file mode 100644 index 0000000..6df89ac --- /dev/null +++ b/.github/workflows/nightBuild.yml @@ -0,0 +1,33 @@ +name: CI + +on: + schedule: + - cron: "0 0 * * *" + + workflow_dispatch: +jobs: + nightly_build: + runs-on: ubuntu-latest + + steps: + - name: Checkout tutorial-compiler + uses: actions/checkout@v2 + with: + repository: devonfw-tutorials/tutorial-compiler + + - name: Checkout playbooks + uses: actions/checkout@v2 + with: + repository: devonfw-tutorials/tutorials + path: playbooks + + - uses: actions/setup-node@v2-beta + + - name: install TS + run: npm install typescript + + - name: npm install + run: npm install + + - name: run buildRun.sh + run: sh buildRun.sh From 2cef25b7a85863d330bc8927b320759e77a4d4d5 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 17:01:55 +0100 Subject: [PATCH 04/16] Update nightBuild.yml --- .github/workflows/nightBuild.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml index 6df89ac..9ae0eb0 100644 --- a/.github/workflows/nightBuild.yml +++ b/.github/workflows/nightBuild.yml @@ -1,8 +1,8 @@ name: CI on: - schedule: - - cron: "0 0 * * *" + #schedule: + #- cron: "0 0 * * *" workflow_dispatch: jobs: @@ -30,4 +30,7 @@ jobs: run: npm install - name: run buildRun.sh - run: sh buildRun.sh + run: | + pwd + ls + sh buildRun.sh From 0e28d1d12f63b0185321b337d8b87009bb7bcdb9 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 17:04:20 +0100 Subject: [PATCH 05/16] Update nightBuild.yml --- .github/workflows/nightBuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml index 9ae0eb0..35e3979 100644 --- a/.github/workflows/nightBuild.yml +++ b/.github/workflows/nightBuild.yml @@ -1,10 +1,11 @@ name: CI on: + pull_request #schedule: #- cron: "0 0 * * *" - workflow_dispatch: + #workflow_dispatch: jobs: nightly_build: runs-on: ubuntu-latest From e34b0055fb961529b48175d18b72408fae281430 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 20:42:53 +0100 Subject: [PATCH 06/16] Update main.yml --- .github/workflows/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e88e175..18fca47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,10 +1,13 @@ name: CI on: - repository_dispatch: - types: [dispatch-katacoda-scenarios] + pull_request + +#on: + #repository_dispatch: + #types: [dispatch-katacoda-scenarios] - workflow_dispatch: + #workflow_dispatch: jobs: build: runs-on: ubuntu-latest From 54399580b4781d9d9143f7abee03e36db662f82d Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 20:44:36 +0100 Subject: [PATCH 07/16] Update main.yml --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 18fca47..9694831 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,7 +52,10 @@ jobs: run: npm install - name: run buildRun.sh - run: sh buildRun.sh -e wiki_eclipse -e wiki_vscode -p ${{ github.event.client_payload.tutorial }} + run: | + pwd + ls + sh buildRun.sh -e wiki_eclipse -e wiki_vscode -p ${{ github.event.client_payload.tutorial }} - name: Checkout uses: actions/checkout@v2 From 25d01069ba5c9fd7f550894d7ffdf993412242e5 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:00:21 +0100 Subject: [PATCH 08/16] Update main.yml --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9694831..55a1a99 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,10 +1,11 @@ name: CI -on: - pull_request - #on: - #repository_dispatch: + # pull_request + +on: + repository_dispatch: + types: open #types: [dispatch-katacoda-scenarios] #workflow_dispatch: From 38fd755f4e855e473aef60daf4088bf77782aac4 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:01:50 +0100 Subject: [PATCH 09/16] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55a1a99..74e5ffa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,8 +5,8 @@ name: CI on: repository_dispatch: - types: open - #types: [dispatch-katacoda-scenarios] + #types: open + types: [dispatch-katacoda-scenarios] #workflow_dispatch: jobs: From 42867803fea1b71bf52278939a0f7325821c72a9 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:04:33 +0100 Subject: [PATCH 10/16] Update nightBuild.yml --- .github/workflows/nightBuild.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml index 35e3979..eb3a679 100644 --- a/.github/workflows/nightBuild.yml +++ b/.github/workflows/nightBuild.yml @@ -1,8 +1,9 @@ name: CI on: - pull_request - #schedule: + #pull_request + schedule: + - cron: "*/30 * *" #- cron: "0 0 * * *" #workflow_dispatch: From 253566fdf4d40784ef2997cda271d1c1c49746aa Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:05:58 +0100 Subject: [PATCH 11/16] Update nightBuild.yml --- .github/workflows/nightBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml index eb3a679..1236546 100644 --- a/.github/workflows/nightBuild.yml +++ b/.github/workflows/nightBuild.yml @@ -3,7 +3,7 @@ name: CI on: #pull_request schedule: - - cron: "*/30 * *" + - cron: "*/30 * * * *" #- cron: "0 0 * * *" #workflow_dispatch: From bdda0179e8087ddb39e74a80a818c8641b62a3d0 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:06:22 +0100 Subject: [PATCH 12/16] Update nightBuild.yml --- .github/workflows/nightBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml index 1236546..3e3b175 100644 --- a/.github/workflows/nightBuild.yml +++ b/.github/workflows/nightBuild.yml @@ -3,7 +3,7 @@ name: CI on: #pull_request schedule: - - cron: "*/30 * * * *" + - cron: "*/5 * * * *" #- cron: "0 0 * * *" #workflow_dispatch: From 003d74a6c557c386acda3dab8fe08055790e3f67 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:16:18 +0100 Subject: [PATCH 13/16] Update nightBuild.yml --- .github/workflows/nightBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml index 3e3b175..fe9c10d 100644 --- a/.github/workflows/nightBuild.yml +++ b/.github/workflows/nightBuild.yml @@ -3,7 +3,7 @@ name: CI on: #pull_request schedule: - - cron: "*/5 * * * *" + - cron: "*/10 * * * *" #- cron: "0 0 * * *" #workflow_dispatch: From 90d1689fa8f639d2f4f14f6f4b65368276a7b823 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:20:55 +0100 Subject: [PATCH 14/16] Update nightBuild.yml --- .github/workflows/nightBuild.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml index fe9c10d..e39cefe 100644 --- a/.github/workflows/nightBuild.yml +++ b/.github/workflows/nightBuild.yml @@ -1,12 +1,11 @@ name: CI on: - #pull_request schedule: - - cron: "*/10 * * * *" + - cron: "*/5 * * * *" #- cron: "0 0 * * *" - #workflow_dispatch: + workflow_dispatch: jobs: nightly_build: runs-on: ubuntu-latest From 6afdef7148aec66b6aadeaaff2290b5fabe18337 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:21:14 +0100 Subject: [PATCH 15/16] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 74e5ffa..900eb27 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ on: #types: open types: [dispatch-katacoda-scenarios] - #workflow_dispatch: + workflow_dispatch: jobs: build: runs-on: ubuntu-latest From 853b016f9b0339d48acd8b78fd4a06ab620820b3 Mon Sep 17 00:00:00 2001 From: MarvDan <89084080+MarvDan@users.noreply.github.com> Date: Thu, 11 Nov 2021 12:31:07 +0100 Subject: [PATCH 16/16] Update nightBuild.yml --- .github/workflows/nightBuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightBuild.yml b/.github/workflows/nightBuild.yml index e39cefe..747f403 100644 --- a/.github/workflows/nightBuild.yml +++ b/.github/workflows/nightBuild.yml @@ -2,8 +2,8 @@ name: CI on: schedule: - - cron: "*/5 * * * *" - #- cron: "0 0 * * *" + # - cron: "*/5 * * * *" + - cron: "0 0 * * *" workflow_dispatch: jobs: