From 5aaf9acd987c31b0abe5273fb46208552db0096b Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 20:18:13 +0200 Subject: [PATCH 1/5] align workflow file naming --- .../{test-admin-interface.yml => test_admin_interface.yml} | 0 .github/workflows/{e2e-test.yml => test_e2e.yml} | 0 .github/workflows/{test-nginx.yml => test_nginx.yml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test-admin-interface.yml => test_admin_interface.yml} (100%) rename .github/workflows/{e2e-test.yml => test_e2e.yml} (100%) rename .github/workflows/{test-nginx.yml => test_nginx.yml} (100%) diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test_admin_interface.yml similarity index 100% rename from .github/workflows/test-admin-interface.yml rename to .github/workflows/test_admin_interface.yml diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/test_e2e.yml similarity index 100% rename from .github/workflows/e2e-test.yml rename to .github/workflows/test_e2e.yml diff --git a/.github/workflows/test-nginx.yml b/.github/workflows/test_nginx.yml similarity index 100% rename from .github/workflows/test-nginx.yml rename to .github/workflows/test_nginx.yml From 2cacecdf9730656eac60ff8d5bec5857b5ff5dc4 Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 20:18:13 +0200 Subject: [PATCH 2/5] align workflow file naming --- .github/workflows/{test_dht-node.yml => test_dht_node.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test_dht-node.yml => test_dht_node.yml} (100%) diff --git a/.github/workflows/test_dht-node.yml b/.github/workflows/test_dht_node.yml similarity index 100% rename from .github/workflows/test_dht-node.yml rename to .github/workflows/test_dht_node.yml From d84b9872bd57c82fe6d843886fb6c9ad214f4bfd Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 21:04:58 +0200 Subject: [PATCH 3/5] use docker-compose file filter unambiguous and only where necessary - change docker-compose file filter name - use new file filter name in workflow files - remove unnecessary docker-compose filtering from build test jobs --- .github/file-filters.yml | 2 +- .github/workflows/test_dht_node.yml | 6 +++--- .github/workflows/test_federation.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 80b7482d9..6690cdb9d 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -33,7 +33,7 @@ admin: &admin dht_node: &dht_node - 'dht-node/**/*' -docker: &docker +docker-compose: &docker-compose - 'docker-compose.*' federation: &federation diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index a57f09399..9ee528da2 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest outputs: dht_node: ${{ steps.changes.outputs.dht_node }} - docker: ${{ steps.changes.outputs.docker }} + docker-compose: ${{ steps.changes.outputs.docker-compose }} steps: - uses: actions/checkout@v3.3.0 @@ -27,7 +27,7 @@ jobs: ############################################################################## build: name: Docker Build Test - DHT Node - if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker == 'true' + if: needs.files-changed.outputs.dht_node == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -65,7 +65,7 @@ jobs: ############################################################################## unit_test: name: Unit Tests - DHT Node - if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker == 'true' + if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index fc29a1bf8..fb8a3f48b 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -9,7 +9,7 @@ jobs: name: Detect File Changes - Federation runs-on: ubuntu-latest outputs: - docker: ${{ steps.changes.outputs.docker }} + docker-compose: ${{ steps.changes.outputs.docker-compose }} federation: ${{ steps.changes.outputs.federation }} steps: - uses: actions/checkout@v3.3.0 @@ -27,7 +27,7 @@ jobs: ############################################################################## build: name: Docker Build Test - Federation - if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.federation == 'true' + if: needs.files-changed.outputs.federation == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -65,7 +65,7 @@ jobs: ############################################################################## unit_test: name: Unit Tests - Federation - if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.federation == 'true' + if: needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.federation == 'true' needs: [files-changed, build] runs-on: ubuntu-latest steps: From ccf5156f986d6ab6a3b5125df657e86034767e2b Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 21:18:52 +0200 Subject: [PATCH 4/5] remove block comments fron dht node and federation workflow files --- .github/workflows/test_dht_node.yml | 13 +------------ .github/workflows/test_federation.yml | 11 ----------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 9ee528da2..04c08e3bc 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -3,8 +3,6 @@ name: Gradido DHT Node Test CI on: push 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 - DHT Node runs-on: ubuntu-latest @@ -22,9 +20,6 @@ jobs: filters: .github/file-filters.yml list-files: shell - ############################################################################## - # JOB: DOCKER BUILD TEST ##################################################### - ############################################################################## build: name: Docker Build Test - DHT Node if: needs.files-changed.outputs.dht_node == 'true' @@ -45,9 +40,6 @@ jobs: name: docker-dht-node-test path: /tmp/dht-node.tar - ############################################################################## - # JOB: LINT ################################################################## - ############################################################################## lint: name: Lint - DHT Node if: needs.files-changed.outputs.dht_node == 'true' @@ -60,10 +52,7 @@ jobs: - name: Lint run: cd dht-node && yarn && yarn run lint - ############################################################################## - # JOB: UNIT TEST ############################################################# - ############################################################################## - unit_test: + unit_test: name: Unit Tests - DHT Node if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build] diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index fb8a3f48b..5fd714b00 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -3,8 +3,6 @@ name: Gradido Federation Test CI on: push 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 - Federation runs-on: ubuntu-latest @@ -22,9 +20,6 @@ jobs: filters: .github/file-filters.yml list-files: shell - ############################################################################## - # JOB: DOCKER BUILD TEST ##################################################### - ############################################################################## build: name: Docker Build Test - Federation if: needs.files-changed.outputs.federation == 'true' @@ -45,9 +40,6 @@ jobs: name: docker-federation-test path: /tmp/federation.tar - ############################################################################## - # JOB: LINT ################################################################## - ############################################################################## lint: name: Lint - Federation if: needs.files-changed.outputs.federation == 'true' @@ -60,9 +52,6 @@ jobs: - name: Lint run: cd federation && yarn && yarn run lint - ############################################################################## - # JOB: UNIT TEST ############################################################# - ############################################################################## unit_test: name: Unit Tests - Federation if: needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.federation == 'true' From b9527ae3f94dd4cc8c9b5ee6556f5456736a0606 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 14:41:53 +0200 Subject: [PATCH 5/5] fix test_dht_node.yml --- .github/workflows/test_dht_node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 04c08e3bc..bb24f2d2f 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -52,7 +52,7 @@ jobs: - name: Lint run: cd dht-node && yarn && yarn run lint - unit_test: + unit_test: name: Unit Tests - DHT Node if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build]