Fixed syntax for calling reusable workflwos

hashtopolis · Jan 16, 2025 · d8b65e7 · d8b65e7
1 parent 6bc0b22
commit d8b65e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,13 +11,14 @@ on:
     - dev
 
 jobs:
+  start-hashtopolis:
+      uses: ./.github/workflows/start_server.yml
   build:
+    needs: start-hashtopolis
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-      - name: Start Hashtopolis
-        uses: ./.github/workflows/start_server.yml
       - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary
         run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src"
       - name: Run test suite

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -5,7 +5,10 @@ on:
     branches:
       - docs
 jobs:
+  start-hashtopolis:
+    uses: ./.github/workflows/start_server.yml
   build:
+    needs: start-hashtopolis
     runs-on: ubuntu-latest
 
     steps:
@@ -25,8 +28,6 @@ jobs:
         sudo apt-get install nodejs
         sudo apt-get install npm 
         sudo npm i openapi-to-md -g
-    - name: Start Hashtopolis
-      uses: ./.github/workflows/start_server.yml
     - name: Download newest apiv2 spec
       run: |
         wget http://localhost:8080/api/v2/openapi.json -P /tmp/
@@ -40,4 +41,4 @@ jobs:
         FTP_USERNAME: ${{ secrets.FTP_USERNAME }}
         FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
       run: |
-        lftp -e "mirror -R site/ /; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER
+        lftp -e "mirror -R site/ /; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER