Directrories restructure fix CI

uniuuu · Oct 22, 2023 · 84d9854 · 84d9854
1 parent d21f234
commit 84d9854
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build-all-images.yml b/.github/workflows/build-all-images.yml
@@ -23,9 +23,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: Checkout submodules
         run: | 
-           git submodule update --init dataserver
-           git submodule update --init stream-server
-           git submodule update --init tinymce-clean-server
+           git submodule update --init stack/dataserver/dataserver
+           git submodule update --init stack/stream-server/stream-server
+           git submodule update --init stack/tinymce-clean-server/tinymce-clean-server
       - name: Bootstrap config
         run: cp .env_example .env
       - name: Build the stack

diff --git a/.github/workflows/build-dataserver-image.yml b/.github/workflows/build-dataserver-image.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Checkout submodules
-      run: git submodule update --init dataserver
+      run: git submodule update --init stack/dataserver/dataserver
     - 
       name: Build the Dataserver Docker image
       run: |

diff --git a/.github/workflows/build-streamserver-image.yml b/.github/workflows/build-streamserver-image.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Checkout submodules
-      run: git submodule update --init stream-server
+      run: git submodule update --init stack/stream-server/stream-server
     - name: Build the Streamserver Docker Image
 #      working-directory: ./stream-server
       run: |

diff --git a/.github/workflows/test-client-build-docker.yml b/.github/workflows/test-client-build-docker.yml
@@ -4,15 +4,15 @@ on:
   push:
     paths:
       - client/**
-      - clientbuildtest.Dockerfile
+      - client/clientbuildtest.Dockerfile
       - .github/workflows/test-client-build-docker.yml
     branches: [ "development" ]
 
   pull_request:
     branches: [ "development" ]
     paths:
       - client/**
-      - clientbuildtest.Dockerfile
+      - client/clientbuildtest.Dockerfile
       - .github/workflows/test-client-build-docker.yml
   workflow_dispatch:      
 jobs:

diff --git a/.github/workflows/test-dataserver-php-composer.yml b/.github/workflows/test-dataserver-php-composer.yml
@@ -4,12 +4,12 @@ on:
   push:
     branches: [ "development" ]
     paths:
-      - dataserver/**
+      - stack/dataserver/**
       - .github/workflows/test-dataserver-php-composer.yml
   pull_request:
     branches: [ "development" ]
     paths:
-      - dataserver/**
+      - stack/dataserver/**
       - .github/workflows/test-dataserver-php-composer.yml
   workflow_dispatch:
 permissions:
@@ -44,21 +44,21 @@ jobs:
         php-version: ${{ matrix.php-version }}
 
     - name: Checkout submodules
-      run: git submodule update --init dataserver
+      run: git submodule update --init stack/dataserver/dataserver
 
     - name: Update composer.json AGPL version
-      working-directory: ./dataserver
+      working-directory: .stack/dataserver/dataserver
       run: sed -i 's/AGPL-3.0/AGPL-3.0-only/g' composer.json
 
 
     - name: Validate composer.json and composer.lock
-      working-directory: ./dataserver
+      working-directory: .stack/dataserver/dataserver
       run: composer validate --strict
 
 
     - name: "Determine composer cache directory"
       id: "determine-composer-cache-directory"
-      working-directory: ./dataserver
+      working-directory: .stack/dataserver/dataserver
       run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
 
     - name: "Cache dependencies installed with composer"
@@ -79,7 +79,7 @@ jobs:
 #          ${{ runner.os }}-php-
 
     - name: Install dependencies
-      working-directory: ./dataserver
+      working-directory: .stack/dataserver/dataserver
       run: composer install --prefer-dist --no-progress
 
     # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"

diff --git a/.github/workflows/update-fork_dataserver_update-submodule.yml b/.github/workflows/update-fork_dataserver_update-submodule.yml
@@ -57,7 +57,7 @@ jobs:
       - uses: fregante/setup-git-user@v2
       - name: Checkout submodules
         run: |
-          git submodule update --init --recursive --remote dataserver
+          git submodule update --init --recursive --remote stack/dataserver/dataserver
           git add .
           git commit -m 'Github Actions Update Submodule dataserver'
           git push origin development

diff --git a/.github/workflows/update-fork_streamserver_update-submodule.yml b/.github/workflows/update-fork_streamserver_update-submodule.yml
@@ -65,7 +65,7 @@ jobs:
       - uses: fregante/setup-git-user@v2
       - name: Checkout submodules
         run: |
-          git submodule update --init --recursive --remote stream-server
+          git submodule update --init --recursive --remote stack/stream-server/stream-server
           git add .
           git commit -m 'Github Actions Update Submodule stream-server'
           git push origin development

diff --git a/.github/workflows/update-fork_tinymcecleanserver_update-submodule.yml b/.github/workflows/update-fork_tinymcecleanserver_update-submodule.yml
@@ -57,7 +57,7 @@ jobs:
       - uses: fregante/setup-git-user@v2
       - name: Checkout submodules
         run: |
-          git submodule update --init --recursive --remote tinymce-clean-server
+          git submodule update --init --recursive --remote stack/tinymce-clean-server/tinymce-clean-server
           git add .
           git commit -m 'Github Actions Update Submodule tinymce-clean-server'
           git push origin development