Merge pull request 'Remove the steps related to pulling qore/frontend in the deploy job' (#1) from qore-remove-clone into qore

Reviewed-on: #1

.gitea/workflows/deploy.yml

@@ -5,7 +5,7 @@ on:
         required: true
         type: string
       env:
-        required: false
+        required: true
         type: string
     inputs:
       environment:
@@ -18,9 +18,6 @@ on:
       node-package-manager:
         required: false
         type: string
-      node-package-manager-install-args:
-        required: false
-        type: string
       frontend-directory:
         required: false
         type: string
@@ -28,10 +25,6 @@ on:
         required: false
         type: string
         default: --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader --ignore-platform-reqs
-      working-directory:
-        required: false
-        type: string
-        default: ./
       username:
         required: false
         type: string
@@ -50,19 +43,16 @@ jobs:
         username: ${{ inputs.username }}
         password: ${{ inputs.password }}
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - name: Setup composer
-        uses: https://git.qlic.nl/actions/setup-composer@39079e200da5483e53afeff1be193daec6ed561a
+        uses: https://git.qlic.nl/actions/setup-composer@v1
         with:
           args: ${{ inputs.composer-args }}
-          working-directory: ${{ inputs.working-directory }}
-
-      - name: Set working directory
-        run: cd ${{ inputs.working-directory }}
 
       - name: Create .env file from secret
-        if: ${{ secrets.env }}
         run: echo "${{ secrets.env }}" > .env
-        working-directory: ${{ inputs.working-directory }}
 
       - name: Build
         if: ${{ inputs.node-package-manager }}
@@ -72,29 +62,25 @@ jobs:
           fi
 
           if [ "${{ inputs.node-package-manager }}" = "npm" ]; then
-            ${{ inputs.node-package-manager }} ci ${{ inputs.node-package-manager-install-args }}
+            ${{ inputs.node-package-manager }} ci
           elif [ "${{ inputs.node-package-manager }}" = "pnpm" ] || [ "${{ inputs.node-package-manager }}" = "yarn" ]; then
-            ${{ inputs.node-package-manager }} install --frozen-lockfile ${{ inputs.node-package-manager-install-args }}
+            ${{ inputs.node-package-manager }} install --frozen-lockfile
           fi
 
           if [ "${{ inputs.node-package-manager }}" != "none" ] && [ -n "${{ inputs.node-package-manager }}" ]; then
             ${{ inputs.node-package-manager }} run build
           fi
-        working-directory: ${{ inputs.working-directory }}
       
 
       - name: Set up SSH agent
         uses: webfactory/ssh-agent@v0.5.3
         with:
           ssh-private-key: ${{ secrets.ssh-private-key }}
-        working-directory: ${{ inputs.working-directory }}
 
       - name: Disable strict host key checking
         run: |
           echo "Host *" >> ~/.ssh/config
           echo "    StrictHostKeyChecking no" >> ~/.ssh/config
-        working-directory: ${{ inputs.working-directory }}
 
       - name: Deploy
-        run: vendor/bin/dep deploy ${{ inputs.environment }}
+        run: vendor/bin/dep deploy environment="${{ inputs.environment }}"
-        working-directory: ${{ inputs.working-directory }}

.gitea/workflows/qore.yml

@@ -0,0 +1,93 @@
+on:
+  workflow_call:
+    secrets:
+      ssh-private-key:
+        required: true
+        type: string
+      env:
+        required: true
+        type: string
+      frontend-env:
+        required: true
+        type: string
+    inputs:
+      environment:
+        required: true
+        type: string
+      image:
+        required: false
+        type: string
+        default: git.qlic.nl/qlic/deploy:php8.3-node22
+      node-package-manager:
+        required: false
+        type: string
+      frontend-directory:
+        required: false
+        type: string
+      composer-args:
+        required: false
+        type: string
+        default: --verbose --prefer-dist --no-progress --no-interaction --no-dev --optimize-autoloader --ignore-platform-reqs
+      username:
+        required: false
+        type: string
+        default: ${{ vars.REGISTRY_USERNAME }}
+      password:
+        required: false
+        type: string
+        default: ${{ vars.REGISTRY_PASSWORD }}
+
+jobs:
+  deploy:
+    runs-on: ubuntu-24.04
+    container:
+      image: ${{ inputs.image }}
+      credentials:
+        username: ${{ inputs.username }}
+        password: ${{ inputs.password }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          clean: false
+
+      - name: Setup composer
+        uses: https://git.qlic.nl/actions/setup-composer@v1
+        with:
+          args: ${{ inputs.composer-args }}
+
+      - name: Create frontend .env file from secret
+        run: echo "${{ secrets.frontend-env }}" > frontend/.env
+
+      - name: Create .env file from secret
+        run: echo "${{ secrets.env }}" > .env
+
+      - name: Build
+        if: ${{ inputs.node-package-manager }}
+        run: |
+          if [ -n "${{ inputs.frontend-directory }}" ]; then
+            cd "${{ inputs.frontend-directory }}"
+          fi
+          
+          if [ "${{ inputs.node-package-manager }}" = "npm" ]; then
+            ${{ inputs.node-package-manager }} ci
+          elif [ "${{ inputs.node-package-manager }}" = "pnpm" ] || [ "${{ inputs.node-package-manager }}" = "yarn" ]; then
+            ${{ inputs.node-package-manager }} install --frozen-lockfile
+          fi
+
+          if [ "${{ inputs.node-package-manager }}" != "none" ] && [ -n "${{ inputs.node-package-manager }}" ]; then
+            ${{ inputs.node-package-manager }} run build
+          fi
+      
+      - name: Set up SSH agent
+        uses: webfactory/ssh-agent@v0.5.3
+        with:
+          ssh-private-key: ${{ secrets.ssh-private-key }}
+
+      - name: Disable strict host key checking
+        run: |
+          echo "Host *" >> ~/.ssh/config
+          echo "    StrictHostKeyChecking no" >> ~/.ssh/config
+
+      - name: Deploy
+        run: vendor/bin/dep deploy environment="${{ inputs.environment }}"

.gitignore

@@ -1 +0,0 @@
-.idea