From 225a8239ec028c4b1433800acc3affae7760c69b Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 17 Feb 2023 09:57:53 +0100 Subject: [PATCH 01/58] move all backend jobs to separate workflow file --- .github/workflows/test-admin-interface.yml | 69 ++++++++++++ .github/workflows/test.yml | 124 +-------------------- 2 files changed, 74 insertions(+), 119 deletions(-) create mode 100644 .github/workflows/test-admin-interface.yml diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml new file mode 100644 index 000000000..d126a9075 --- /dev/null +++ b/.github/workflows/test-admin-interface.yml @@ -0,0 +1,69 @@ +name: Gradido Admin Interface Test CI + +on: + push: + branches: + - separate-admin-interface-workflow + +jobs: + build_test_admin: + name: Docker Build Test - Admin Interface + runs-on: ubuntu-latest + steps: + + - name: Checkout code + uses: actions/checkout@v3 + + - name: Admin Interface | Build 'test' image + run: docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test" + + unit_test_admin: + name: Unit Tests - Admin Interface + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Admin Interface | Unit tests + run: | + cd admin && yarn && yarn run test + cp -r ./coverage ../ + + - name: Admin Interface | Coverage check + uses: webcraftmedia/coverage-check-action@master + with: + report_name: Coverage Admin Interface + type: lcov + result_path: ./admin/coverage/lcov.info + min_coverage: 97 + token: ${{ github.token }} + + lint_admin: + name: Lint - Admin Interface + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Admin Interface | Lint + run: cd admin && yarn && yarn run lint + + stylelint_admin: + name: Stylelint - Admin Interface + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Admin Interface | Stylelint + run: cd admin && yarn && yarn run stylelint + + locales_admin: + name: Locales - Admin Interface + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Admin Interface | Locales + run: cd admin && yarn && yarn run locales diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index badb47e87..722bef1c1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,9 @@ name: gradido test CI -on: push +on: + push: + branches: + - separate-admin-interface-workflow jobs: ############################################################################## @@ -29,31 +32,6 @@ jobs: name: docker-frontend-test path: /tmp/frontend.tar - ############################################################################## - # JOB: DOCKER BUILD TEST ADMIN INTERFACE ##################################### - ############################################################################## - build_test_admin: - name: Docker Build Test - Admin Interface - runs-on: ubuntu-latest - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # ADMIN INTERFACE ######################################################## - ########################################################################## - - name: Admin | Build `test` image - run: | - docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test" - docker save "gradido/admin:test" > /tmp/admin.tar - - name: Upload Artifact - uses: actions/upload-artifact@v3 - with: - name: docker-admin-test - path: /tmp/admin.tar - ############################################################################## # JOB: DOCKER BUILD TEST BACKEND ############################################# ############################################################################## @@ -211,60 +189,6 @@ jobs: - name: Frontend | Stylelint run: cd frontend && yarn && yarn run stylelint - ############################################################################## - # JOB: LINT ADMIN INTERFACE ################################################## - ############################################################################## - lint_admin: - name: Lint - Admin Interface - runs-on: ubuntu-latest - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # LINT ADMIN INTERFACE ################################################### - ########################################################################## - - name: Admin Interface | Lint - run: cd admin && yarn && yarn run lint - - ############################################################################## - # JOB: STYLELINT ADMIN INTERFACE ############################################# - ############################################################################## - stylelint_admin: - name: Stylelint - Admin Interface - runs-on: ubuntu-latest - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # STYLELINT ADMIN INTERFACE ############################################## - ########################################################################## - - name: Admin Interface | Stylelint - run: cd admin && yarn && yarn run stylelint - - ############################################################################## - # JOB: LOCALES ADMIN ######################################################### - ############################################################################## - locales_admin: - name: Locales - Admin Interface - runs-on: ubuntu-latest - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # LOCALES FRONTEND ####################################################### - ########################################################################## - - name: Admin | Locales - run: cd admin && yarn && yarn run locales - ############################################################################## # JOB: LINT BACKEND ########################################################## ############################################################################## @@ -349,37 +273,6 @@ jobs: result_path: ./frontend/coverage/lcov.info min_coverage: 95 token: ${{ github.token }} - - ############################################################################## - # JOB: UNIT TEST ADMIN INTERFACE ############################################# - ############################################################################## - unit_test_admin: - name: Unit tests - Admin Interface - runs-on: ubuntu-latest - steps: - ########################################################################## - # CHECKOUT CODE ########################################################## - ########################################################################## - - name: Checkout code - uses: actions/checkout@v3 - ########################################################################## - # UNIT TESTS ADMIN INTERFACE ############################################# - ########################################################################## - - name: Admin Interface | Unit tests - run: | - cd admin && yarn && yarn run test - cp -r ./coverage ../ - ########################################################################## - # COVERAGE CHECK ADMIN INTERFACE ######################################### - ########################################################################## - - name: Admin Interface | Coverage check - uses: webcraftmedia/coverage-check-action@master - with: - report_name: Coverage Admin Interface - type: lcov - result_path: ./admin/coverage/lcov.info - min_coverage: 97 - token: ${{ github.token }} ############################################################################## # JOB: UNIT TEST BACKEND #################################################### @@ -459,7 +352,7 @@ jobs: end-to-end-tests: name: End-to-End Tests runs-on: ubuntu-latest - needs: [build_test_mariadb, build_test_database_up, build_test_admin, build_test_frontend, build_test_nginx] + needs: [build_test_mariadb, build_test_database_up, build_test_frontend, build_test_nginx] steps: ########################################################################## # CHECKOUT CODE ########################################################## @@ -490,13 +383,6 @@ jobs: path: /tmp - name: Load Docker Image (Frontend) run: docker load < /tmp/frontend.tar - - name: Download Docker Image (Admin Interface) - uses: actions/download-artifact@v3 - with: - name: docker-admin-test - path: /tmp - - name: Load Docker Image (Admin Interface) - run: docker load < /tmp/admin.tar - name: Download Docker Image (Nginx) uses: actions/download-artifact@v3 with: From d411ca76821756295647a69ab27da6871af40863 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 21 Feb 2023 10:42:47 +0100 Subject: [PATCH 02/58] add file change check to test admin workflow --- .github/file-filters.yml | 4 ++++ .github/workflows/test-admin-interface.yml | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 .github/file-filters.yml diff --git a/.github/file-filters.yml b/.github/file-filters.yml new file mode 100644 index 000000000..526cb0c7f --- /dev/null +++ b/.github/file-filters.yml @@ -0,0 +1,4 @@ +# These file filter patterns are used by the action https://github.com/dorny/paths-filter + +admin_locales: &admin_locales + - 'admin/src/locales/**' \ No newline at end of file diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index d126a9075..cfb888ff7 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -6,6 +6,23 @@ on: - separate-admin-interface-workflow jobs: + # + files-changed: + name: Detect File Changes - Admin Interface + runs-on: ubuntu-latest + outputs: + admin_locales: ${{ steps.changes.outputs.admin_locales }} + steps: + - uses: actions/checkout@v3.3.0 + + - name: Check for admin interface file changes + uses: dorny/paths-filter@v2.11.1 + id: changes + with: + token: ${{ github.token }} + filters: .github/file-filters.yml + list-files: shell + build_test_admin: name: Docker Build Test - Admin Interface runs-on: ubuntu-latest @@ -59,7 +76,9 @@ jobs: run: cd admin && yarn && yarn run stylelint locales_admin: + if: needs.files-changed.outputs.admin_locales == 'true' name: Locales - Admin Interface + needs: files-changed runs-on: ubuntu-latest steps: - name: Checkout code From ef9ad7e4a8f97094429c3aba953dd7b431ba96d5 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 21 Feb 2023 11:17:36 +0100 Subject: [PATCH 03/58] add file change check for stylelinting to test admin workflow --- .github/file-filters.yml | 6 +++++- .github/workflows/test-admin-interface.yml | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 526cb0c7f..d835f778f 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -1,4 +1,8 @@ # These file filter patterns are used by the action https://github.com/dorny/paths-filter admin_locales: &admin_locales - - 'admin/src/locales/**' \ No newline at end of file + - 'admin/src/locales/**' + +admin_stylelinting: &admin_stylelinting + - 'admin/{components,layouts,pages}/**/*.{scss,vue}' + - 'admin/.stylelintrc.js' diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index cfb888ff7..a0e81747b 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -12,6 +12,7 @@ jobs: runs-on: ubuntu-latest outputs: admin_locales: ${{ steps.changes.outputs.admin_locales }} + admin_stylelinting: ${{ steps.changes.outputs.admin_stylelinting }} steps: - uses: actions/checkout@v3.3.0 @@ -66,7 +67,9 @@ jobs: run: cd admin && yarn && yarn run lint stylelint_admin: + if: needs.files-changed.outputs.admin_stylelinting == 'true' name: Stylelint - Admin Interface + needs: admin_stylelinting runs-on: ubuntu-latest steps: - name: Checkout code From 84515a51132b35d4cb48885b0b0832fe92ca7c91 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 21 Feb 2023 11:19:49 +0100 Subject: [PATCH 04/58] fix typo --- .github/workflows/test-admin-interface.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index a0e81747b..0fcb1f549 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -69,7 +69,7 @@ jobs: stylelint_admin: if: needs.files-changed.outputs.admin_stylelinting == 'true' name: Stylelint - Admin Interface - needs: admin_stylelinting + needs: files-changed runs-on: ubuntu-latest steps: - name: Checkout code From fd37107da3da67b565f845b2e9e8073a07ef904e Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 08:36:29 +0100 Subject: [PATCH 05/58] set allother test workflows tonot run while working in this branch --- .github/workflows/test.yml | 2 +- .github/workflows/test_dht-node.yml | 6 ++++-- .github/workflows/test_federation.yml | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 722bef1c1..a435c7425 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: gradido test CI on: push: branches: - - separate-admin-interface-workflow + - none jobs: ############################################################################## diff --git a/.github/workflows/test_dht-node.yml b/.github/workflows/test_dht-node.yml index 5b3a65a70..35d9bca7d 100644 --- a/.github/workflows/test_dht-node.yml +++ b/.github/workflows/test_dht-node.yml @@ -1,7 +1,9 @@ name: gradido test_dht-node CI -on: push - +on: + push: + branches: + - none jobs: ############################################################################## # JOB: DOCKER BUILD TEST ##################################################### diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index 2da78758e..b49473af2 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -1,6 +1,9 @@ name: gradido test_federation CI -on: push +on: + push: + branches: + - none jobs: ############################################################################## From 287659af0695fb06ae3254603c6dfb87f951f329 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 08:54:33 +0100 Subject: [PATCH 06/58] add file change check for linting to test admin workflow --- .github/file-filters.yml | 6 ++++++ .github/workflows/test-admin-interface.yml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index d835f778f..81f44a157 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -6,3 +6,9 @@ admin_locales: &admin_locales admin_stylelinting: &admin_stylelinting - 'admin/{components,layouts,pages}/**/*.{scss,vue}' - 'admin/.stylelintrc.js' + +admin_linting: &admin_linting + - 'admin/.eslint*' + - 'admin/babel.config.js' + - 'admin/package.json' + - 'admin/**/*.{js,vue}' \ No newline at end of file diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index 0fcb1f549..4faa60550 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -11,6 +11,7 @@ jobs: name: Detect File Changes - Admin Interface runs-on: ubuntu-latest outputs: + admin_linting: ${{ steps.changes.outputs.admin_linting }} admin_locales: ${{ steps.changes.outputs.admin_locales }} admin_stylelinting: ${{ steps.changes.outputs.admin_stylelinting }} steps: @@ -57,7 +58,9 @@ jobs: token: ${{ github.token }} lint_admin: + if: needs.files-changed.outputs.admin_linting == 'true' name: Lint - Admin Interface + needs:files-changed runs-on: ubuntu-latest steps: - name: Checkout code From 6b4579454d5e7b5e660da09a5f19e0613395d582 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 08:56:34 +0100 Subject: [PATCH 07/58] add sortscriptsto admin locales file filter --- .github/file-filters.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 81f44a157..99cc32d3e 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -2,6 +2,7 @@ admin_locales: &admin_locales - 'admin/src/locales/**' + - 'admin/scripts/sort*' admin_stylelinting: &admin_stylelinting - 'admin/{components,layouts,pages}/**/*.{scss,vue}' From af6b08bfd7c4aabeb49d74c8dcdee5d8ad194a35 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 08:58:27 +0100 Subject: [PATCH 08/58] fix typo --- .github/workflows/test-admin-interface.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index 4faa60550..a721be8fd 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -60,7 +60,7 @@ jobs: lint_admin: if: needs.files-changed.outputs.admin_linting == 'true' name: Lint - Admin Interface - needs:files-changed + needs: files-changed runs-on: ubuntu-latest steps: - name: Checkout code From 964bdebbda36085f75340a9556c42e291765fae5 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 09:54:13 +0100 Subject: [PATCH 09/58] add locales filter to linting filter --- .github/file-filters.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 99cc32d3e..b55174526 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -11,5 +11,10 @@ admin_stylelinting: &admin_stylelinting admin_linting: &admin_linting - 'admin/.eslint*' - 'admin/babel.config.js' + - 'admin/package.json' + - 'admin/**/*.{js,vue}' + - *admin_locales + +admin_unit_testing: &admin_unit_testing - 'admin/package.json' - 'admin/**/*.{js,vue}' \ No newline at end of file From 72511fb14e83acca3547cfec01ccaabffcb336dd Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 10:44:49 +0100 Subject: [PATCH 10/58] add file change check for unit tests to test admin workflow --- .github/file-filters.yml | 3 ++- .github/workflows/test-admin-interface.yml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index b55174526..96bcbd7c8 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -17,4 +17,5 @@ admin_linting: &admin_linting admin_unit_testing: &admin_unit_testing - 'admin/package.json' - - 'admin/**/*.{js,vue}' \ No newline at end of file + - 'admin/{jest,vue}.config.js' + - 'admin/{public,run,src,test}/**/*' diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index a721be8fd..4809059cd 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -14,6 +14,7 @@ jobs: admin_linting: ${{ steps.changes.outputs.admin_linting }} admin_locales: ${{ steps.changes.outputs.admin_locales }} admin_stylelinting: ${{ steps.changes.outputs.admin_stylelinting }} + admin_unit_testing: ${{ steps.changes.outputs.admin_unit_testing }} steps: - uses: actions/checkout@v3.3.0 @@ -37,7 +38,9 @@ jobs: run: docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test" unit_test_admin: + if: needs.files-changed.outputs.admin_unit_testing == 'true' name: Unit Tests - Admin Interface + needs: files-changed runs-on: ubuntu-latest steps: - name: Checkout code From 4d6854463ad9f235d74a3e171239c9f02f3424df Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 11:10:48 +0100 Subject: [PATCH 11/58] add file change check for building test to test admin workflow --- .github/file-filters.yml | 5 +++++ .github/workflows/test-admin-interface.yml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 96bcbd7c8..fa00c33fb 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -19,3 +19,8 @@ admin_unit_testing: &admin_unit_testing - 'admin/package.json' - 'admin/{jest,vue}.config.js' - 'admin/{public,run,src,test}/**/*' + +admin_docker_building: &admin_docker_building + - 'admin/.dockerignore' + - 'admin/Dockerfile' + - *admin_unit_testing \ No newline at end of file diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index 4809059cd..44316040b 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -11,6 +11,7 @@ jobs: name: Detect File Changes - Admin Interface runs-on: ubuntu-latest outputs: + admin_docker_building: ${{ steps.changes.outputs.admin_docker_building }} admin_linting: ${{ steps.changes.outputs.admin_linting }} admin_locales: ${{ steps.changes.outputs.admin_locales }} admin_stylelinting: ${{ steps.changes.outputs.admin_stylelinting }} @@ -27,7 +28,9 @@ jobs: list-files: shell build_test_admin: + if: needs.files-changed.outputs.admin_docker_building == 'true' name: Docker Build Test - Admin Interface + needs: files-changed runs-on: ubuntu-latest steps: From 10bbf6dfbd487552c07a4b490032b78ee2c4b8b1 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 11:16:33 +0100 Subject: [PATCH 12/58] add file change check for building test to test admin workflow --- .github/workflows/test-admin-interface.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index 44316040b..60e22b5cd 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -28,7 +28,7 @@ jobs: list-files: shell build_test_admin: - if: needs.files-changed.outputs.admin_docker_building == 'true' + if: needs.files-changed.outputs.admin_docker_building == 'true' name: Docker Build Test - Admin Interface needs: files-changed runs-on: ubuntu-latest From c7d467759895ece24ca260c01fc1b84a3053f7b0 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 11:18:46 +0100 Subject: [PATCH 13/58] test change in locaes --- admin/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 00eef1812..14088fe92 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -13,7 +13,7 @@ "deleted": "Automatische Schöpfung gelöscht!", "deleteNow": "Automatische Creations '{name}' wirklich löschen?", "maxPerCycle": "Wiederholungen", - "memo": "Nachricht", + "memo": "NachrichtTEST", "name": "Name", "newContributionLink": "Neuer Beitragslink", "noContributionLinks": "Es sind keine Beitragslinks angelegt.", From fdb975fe4f78543b1650672e39d5184d6c86042b Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 11:26:57 +0100 Subject: [PATCH 14/58] exclude locales files from filter for unit tests --- .github/file-filters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index fa00c33fb..9f6ab116a 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -18,7 +18,7 @@ admin_linting: &admin_linting admin_unit_testing: &admin_unit_testing - 'admin/package.json' - 'admin/{jest,vue}.config.js' - - 'admin/{public,run,src,test}/**/*' + - 'admin/{public,run,src!(locales),test}/**/*' admin_docker_building: &admin_docker_building - 'admin/.dockerignore' From 06174a8082ff8f19f2bacc970b2836642ef61f87 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 11:26:57 +0100 Subject: [PATCH 15/58] exclude locales files from filter for unit tests --- .github/file-filters.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 9f6ab116a..ff8451785 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -18,7 +18,8 @@ admin_linting: &admin_linting admin_unit_testing: &admin_unit_testing - 'admin/package.json' - 'admin/{jest,vue}.config.js' - - 'admin/{public,run,src!(locales),test}/**/*' + - 'admin/{public,run,test}/**/*' + - 'admin/src/!(locales)/**/*' admin_docker_building: &admin_docker_building - 'admin/.dockerignore' From 83491184033e2b6848599da8bbbf1fa73628728f Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 11:52:11 +0100 Subject: [PATCH 16/58] test changes --- admin/Dockerfile | 2 +- admin/src/locales/de.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index ed0623a63..6b2e4d9d9 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,5 +1,5 @@ ################################################################################## -# BASE ########################################################################### +# BASE #######################################################################TEST ################################################################################## FROM node:14.17.0-alpine3.10 as base diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 14088fe92..00eef1812 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -13,7 +13,7 @@ "deleted": "Automatische Schöpfung gelöscht!", "deleteNow": "Automatische Creations '{name}' wirklich löschen?", "maxPerCycle": "Wiederholungen", - "memo": "NachrichtTEST", + "memo": "Nachricht", "name": "Name", "newContributionLink": "Neuer Beitragslink", "noContributionLinks": "Es sind keine Beitragslinks angelegt.", From 1181c4b85d73899a36066915c57f05e9de776e8a Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 11:58:33 +0100 Subject: [PATCH 17/58] test changes --- admin/Dockerfile | 2 +- admin/src/graphql/adminCreateContribution.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index 6b2e4d9d9..ed0623a63 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,5 +1,5 @@ ################################################################################## -# BASE #######################################################################TEST +# BASE ########################################################################### ################################################################################## FROM node:14.17.0-alpine3.10 as base diff --git a/admin/src/graphql/adminCreateContribution.js b/admin/src/graphql/adminCreateContribution.js index 5ee409c67..1c40f3ff1 100644 --- a/admin/src/graphql/adminCreateContribution.js +++ b/admin/src/graphql/adminCreateContribution.js @@ -1,5 +1,6 @@ import gql from 'graphql-tag' +// TEST export const adminCreateContribution = gql` mutation ($email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) { adminCreateContribution( From e326e874b8d1d745d31e3ddf44f1f2c29922507d Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 12:17:29 +0100 Subject: [PATCH 18/58] undo test changes --- admin/src/graphql/adminCreateContribution.js | 1 - 1 file changed, 1 deletion(-) diff --git a/admin/src/graphql/adminCreateContribution.js b/admin/src/graphql/adminCreateContribution.js index 1c40f3ff1..5ee409c67 100644 --- a/admin/src/graphql/adminCreateContribution.js +++ b/admin/src/graphql/adminCreateContribution.js @@ -1,6 +1,5 @@ import gql from 'graphql-tag' -// TEST export const adminCreateContribution = gql` mutation ($email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) { adminCreateContribution( From 949887fe009657db0af9c58df7ba14c0fc714c0b Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 13:49:41 +0100 Subject: [PATCH 19/58] set test.yml to be triggered by push to this current branch --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a435c7425..722bef1c1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,7 +3,7 @@ name: gradido test CI on: push: branches: - - none + - separate-admin-interface-workflow jobs: ############################################################################## From c7559b8606dffc73ad51a550a8b138908d5b6311 Mon Sep 17 00:00:00 2001 From: mahula Date: Thu, 23 Feb 2023 13:56:05 +0100 Subject: [PATCH 20/58] add shortdocumentation to filechange job --- .github/workflows/test-admin-interface.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index 60e22b5cd..9f589efce 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -6,7 +6,8 @@ on: - separate-admin-interface-workflow jobs: - # + # only (but most important) job from this workflow required for pull requests + # check results serve as run conditions for all other jobs here files-changed: name: Detect File Changes - Admin Interface runs-on: ubuntu-latest From 132f92956b7e5662c925a8510b9ac84c2458b0f6 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 24 Feb 2023 08:23:18 +0100 Subject: [PATCH 21/58] set file change filter for admin test workflow to main directory --- .github/file-filters.yml | 5 ++++- .github/workflows/test-admin-interface.yml | 16 ++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index ff8451785..12832aaca 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -24,4 +24,7 @@ admin_unit_testing: &admin_unit_testing admin_docker_building: &admin_docker_building - 'admin/.dockerignore' - 'admin/Dockerfile' - - *admin_unit_testing \ No newline at end of file + - *admin_unit_testing + +admin_main: &admin_main + - 'admin/**/*' \ No newline at end of file diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index 9f589efce..7bdfa84cf 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -12,11 +12,7 @@ jobs: name: Detect File Changes - Admin Interface runs-on: ubuntu-latest outputs: - admin_docker_building: ${{ steps.changes.outputs.admin_docker_building }} - admin_linting: ${{ steps.changes.outputs.admin_linting }} - admin_locales: ${{ steps.changes.outputs.admin_locales }} - admin_stylelinting: ${{ steps.changes.outputs.admin_stylelinting }} - admin_unit_testing: ${{ steps.changes.outputs.admin_unit_testing }} + admin_main: ${{ steps.changes.outputs.admin_main }} steps: - uses: actions/checkout@v3.3.0 @@ -29,7 +25,7 @@ jobs: list-files: shell build_test_admin: - if: needs.files-changed.outputs.admin_docker_building == 'true' + if: needs.files-changed.outputs.admin_main == 'true' name: Docker Build Test - Admin Interface needs: files-changed runs-on: ubuntu-latest @@ -42,7 +38,7 @@ jobs: run: docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test" unit_test_admin: - if: needs.files-changed.outputs.admin_unit_testing == 'true' + if: needs.files-changed.outputs.admin_main == 'true' name: Unit Tests - Admin Interface needs: files-changed runs-on: ubuntu-latest @@ -65,7 +61,7 @@ jobs: token: ${{ github.token }} lint_admin: - if: needs.files-changed.outputs.admin_linting == 'true' + if: needs.files-changed.outputs.admin_main == 'true' name: Lint - Admin Interface needs: files-changed runs-on: ubuntu-latest @@ -77,7 +73,7 @@ jobs: run: cd admin && yarn && yarn run lint stylelint_admin: - if: needs.files-changed.outputs.admin_stylelinting == 'true' + if: needs.files-changed.outputs.admin_main == 'true' name: Stylelint - Admin Interface needs: files-changed runs-on: ubuntu-latest @@ -89,7 +85,7 @@ jobs: run: cd admin && yarn && yarn run stylelint locales_admin: - if: needs.files-changed.outputs.admin_locales == 'true' + if: needs.files-changed.outputs.admin_main == 'true' name: Locales - Admin Interface needs: files-changed runs-on: ubuntu-latest From adea7c1c155c3d35cc26cfe8db8f4870baf0ac39 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 24 Feb 2023 12:22:53 +0100 Subject: [PATCH 22/58] rename admit test workflow jobs --- .github/workflows/test-admin-interface.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index 7bdfa84cf..53bd85ca5 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -24,7 +24,7 @@ jobs: filters: .github/file-filters.yml list-files: shell - build_test_admin: + build_test: if: needs.files-changed.outputs.admin_main == 'true' name: Docker Build Test - Admin Interface needs: files-changed @@ -37,7 +37,7 @@ jobs: - name: Admin Interface | Build 'test' image run: docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test" - unit_test_admin: + unit_test: if: needs.files-changed.outputs.admin_main == 'true' name: Unit Tests - Admin Interface needs: files-changed @@ -60,7 +60,7 @@ jobs: min_coverage: 97 token: ${{ github.token }} - lint_admin: + lint: if: needs.files-changed.outputs.admin_main == 'true' name: Lint - Admin Interface needs: files-changed @@ -72,7 +72,7 @@ jobs: - name: Admin Interface | Lint run: cd admin && yarn && yarn run lint - stylelint_admin: + stylelint: if: needs.files-changed.outputs.admin_main == 'true' name: Stylelint - Admin Interface needs: files-changed @@ -84,7 +84,7 @@ jobs: - name: Admin Interface | Stylelint run: cd admin && yarn && yarn run stylelint - locales_admin: + locales: if: needs.files-changed.outputs.admin_main == 'true' name: Locales - Admin Interface needs: files-changed From 289ed452d1d99bf25dce05dd8163c8585673190b Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 24 Feb 2023 13:03:04 +0100 Subject: [PATCH 23/58] rename file filter for admin test workflow --- .github/file-filters.yml | 2 +- .github/workflows/test-admin-interface.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 12832aaca..d6c53c0c8 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -26,5 +26,5 @@ admin_docker_building: &admin_docker_building - 'admin/Dockerfile' - *admin_unit_testing -admin_main: &admin_main +admin: &admin - 'admin/**/*' \ No newline at end of file diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test-admin-interface.yml index 53bd85ca5..1d152a898 100644 --- a/.github/workflows/test-admin-interface.yml +++ b/.github/workflows/test-admin-interface.yml @@ -12,7 +12,7 @@ jobs: name: Detect File Changes - Admin Interface runs-on: ubuntu-latest outputs: - admin_main: ${{ steps.changes.outputs.admin_main }} + admin: ${{ steps.changes.outputs.admin }} steps: - uses: actions/checkout@v3.3.0 @@ -25,7 +25,7 @@ jobs: list-files: shell build_test: - if: needs.files-changed.outputs.admin_main == 'true' + if: needs.files-changed.outputs.admin == 'true' name: Docker Build Test - Admin Interface needs: files-changed runs-on: ubuntu-latest @@ -38,7 +38,7 @@ jobs: run: docker build --target test -t "gradido/admin:test" admin/ --build-arg NODE_ENV="test" unit_test: - if: needs.files-changed.outputs.admin_main == 'true' + if: needs.files-changed.outputs.admin == 'true' name: Unit Tests - Admin Interface needs: files-changed runs-on: ubuntu-latest @@ -61,7 +61,7 @@ jobs: token: ${{ github.token }} lint: - if: needs.files-changed.outputs.admin_main == 'true' + if: needs.files-changed.outputs.admin == 'true' name: Lint - Admin Interface needs: files-changed runs-on: ubuntu-latest @@ -73,7 +73,7 @@ jobs: run: cd admin && yarn && yarn run lint stylelint: - if: needs.files-changed.outputs.admin_main == 'true' + if: needs.files-changed.outputs.admin == 'true' name: Stylelint - Admin Interface needs: files-changed runs-on: ubuntu-latest @@ -85,7 +85,7 @@ jobs: run: cd admin && yarn && yarn run stylelint locales: - if: needs.files-changed.outputs.admin_main == 'true' + if: needs.files-changed.outputs.admin == 'true' name: Locales - Admin Interface needs: files-changed runs-on: ubuntu-latest From 1473e01331df6089786491acb2409360b8931df6 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 24 Feb 2023 13:16:14 +0100 Subject: [PATCH 24/58] test admin file filter with change to admin/Dockerfile --- admin/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index ed0623a63..6b2e4d9d9 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,5 +1,5 @@ ################################################################################## -# BASE ########################################################################### +# BASE #######################################################################TEST ################################################################################## FROM node:14.17.0-alpine3.10 as base From 2d51d6b581fca47ee3bb78b22b03c05cccae9050 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 24 Feb 2023 13:26:52 +0100 Subject: [PATCH 25/58] test admin file filter with change to admin/public --- admin/Dockerfile | 2 +- admin/{public => public_TEST}/favicon.png | Bin .../img/brand/gradido_logo_w.png | Bin admin/{public => public_TEST}/img/brand/green.png | Bin .../{public => public_TEST}/img/elopage_favicon.png | Bin admin/{public => public_TEST}/img/gdd-coin.png | Bin admin/{public => public_TEST}/index.html | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename admin/{public => public_TEST}/favicon.png (100%) rename admin/{public => public_TEST}/img/brand/gradido_logo_w.png (100%) rename admin/{public => public_TEST}/img/brand/green.png (100%) rename admin/{public => public_TEST}/img/elopage_favicon.png (100%) rename admin/{public => public_TEST}/img/gdd-coin.png (100%) rename admin/{public => public_TEST}/index.html (100%) diff --git a/admin/Dockerfile b/admin/Dockerfile index 6b2e4d9d9..ed0623a63 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,5 +1,5 @@ ################################################################################## -# BASE #######################################################################TEST +# BASE ########################################################################### ################################################################################## FROM node:14.17.0-alpine3.10 as base diff --git a/admin/public/favicon.png b/admin/public_TEST/favicon.png similarity index 100% rename from admin/public/favicon.png rename to admin/public_TEST/favicon.png diff --git a/admin/public/img/brand/gradido_logo_w.png b/admin/public_TEST/img/brand/gradido_logo_w.png similarity index 100% rename from admin/public/img/brand/gradido_logo_w.png rename to admin/public_TEST/img/brand/gradido_logo_w.png diff --git a/admin/public/img/brand/green.png b/admin/public_TEST/img/brand/green.png similarity index 100% rename from admin/public/img/brand/green.png rename to admin/public_TEST/img/brand/green.png diff --git a/admin/public/img/elopage_favicon.png b/admin/public_TEST/img/elopage_favicon.png similarity index 100% rename from admin/public/img/elopage_favicon.png rename to admin/public_TEST/img/elopage_favicon.png diff --git a/admin/public/img/gdd-coin.png b/admin/public_TEST/img/gdd-coin.png similarity index 100% rename from admin/public/img/gdd-coin.png rename to admin/public_TEST/img/gdd-coin.png diff --git a/admin/public/index.html b/admin/public_TEST/index.html similarity index 100% rename from admin/public/index.html rename to admin/public_TEST/index.html From d8a786c55b49afad4471d45b9a7fca1bf064ad46 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 24 Feb 2023 13:37:31 +0100 Subject: [PATCH 26/58] undo change to admin/public --- admin/{public_TEST => public}/favicon.png | Bin .../img/brand/gradido_logo_w.png | Bin admin/{public_TEST => public}/img/brand/green.png | Bin .../{public_TEST => public}/img/elopage_favicon.png | Bin admin/{public_TEST => public}/img/gdd-coin.png | Bin admin/{public_TEST => public}/index.html | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename admin/{public_TEST => public}/favicon.png (100%) rename admin/{public_TEST => public}/img/brand/gradido_logo_w.png (100%) rename admin/{public_TEST => public}/img/brand/green.png (100%) rename admin/{public_TEST => public}/img/elopage_favicon.png (100%) rename admin/{public_TEST => public}/img/gdd-coin.png (100%) rename admin/{public_TEST => public}/index.html (100%) diff --git a/admin/public_TEST/favicon.png b/admin/public/favicon.png similarity index 100% rename from admin/public_TEST/favicon.png rename to admin/public/favicon.png diff --git a/admin/public_TEST/img/brand/gradido_logo_w.png b/admin/public/img/brand/gradido_logo_w.png similarity index 100% rename from admin/public_TEST/img/brand/gradido_logo_w.png rename to admin/public/img/brand/gradido_logo_w.png diff --git a/admin/public_TEST/img/brand/green.png b/admin/public/img/brand/green.png similarity index 100% rename from admin/public_TEST/img/brand/green.png rename to admin/public/img/brand/green.png diff --git a/admin/public_TEST/img/elopage_favicon.png b/admin/public/img/elopage_favicon.png similarity index 100% rename from admin/public_TEST/img/elopage_favicon.png rename to admin/public/img/elopage_favicon.png diff --git a/admin/public_TEST/img/gdd-coin.png b/admin/public/img/gdd-coin.png similarity index 100% rename from admin/public_TEST/img/gdd-coin.png rename to admin/public/img/gdd-coin.png diff --git a/admin/public_TEST/index.html b/admin/public/index.html similarity index 100% rename from admin/public_TEST/index.html rename to admin/public/index.html From 1f98fa562147eaa5e84995ecd13d0480d4bd9dd4 Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 24 Feb 2023 13:39:08 +0100 Subject: [PATCH 27/58] test admin file filter with change to admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue --- .../slots/ContributionMessagesListItem.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue index 53006cff5..20cdfd5e6 100644 --- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue +++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue @@ -1,15 +1,17 @@