[pull] develop from runtipi:develop

.dockerignore

@@ -1,19 +1,20 @@
 *
 
 ### Includes ###
+!packages/**/src/**
+!packages/**/public/**
+!packages/**/assets/**
+!packages/**/scripts/**
 !pnpm-*.yaml
 !package.json
+!turbo.json
+!supervisord.*.conf
 !patches/**
-!packages/**/src/**
-!packages/**/assets/**
+
 !**/package.json
-!**/nodemon.json
 !**/tsconfig.json
-!**/build.mjs
-!next.config.mjs
-!sentry.*.config.ts
-!public/**
-!src/**
-!tests/**
-!start.*.sh
-!scripts/**
+!**/nest-cli.json
+!**/tsup.config.ts
+!**/vite.config.ts
+!**/index.html
+

.github/workflows/alpha-release.yml

@@ -22,20 +22,13 @@ jobs:
           VERSION=$(npm run version --silent)
           echo "tagname=v${VERSION}-alpha.${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
 
-      - uses: rickstaa/action-create-tag@v1
-        with:
-          tag: ${{ steps.get_tag.outputs.tagname }}
-
   build-images:
     runs-on: ubuntu-latest
     needs: create-tag
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -89,7 +82,7 @@ jobs:
           repo: cli
           owner: runtipi
           run_id: ${{ steps.return_dispatch.outputs.run_id }}
-          run_timeout_seconds: 300
+          run_timeout_seconds: 1200
           poll_interval_ms: 5000
 
       - name: Create bin folder
@@ -119,19 +112,18 @@ jobs:
           name: cli
           path: bin
 
-  create-release:
+  publish-release:
     runs-on: ubuntu-latest
     needs: [build-images, build-cli, create-tag]
+    outputs:
+      id: ${{ steps.create_release.outputs.id }}
     steps:
       - name: Download CLI
         uses: actions/download-artifact@v4
         with:
           name: cli
           path: cli
 
-      - name: List files
-        run: tree cli
-
       - name: Create alpha release
         id: create_release
         uses: softprops/action-gh-release@v2
@@ -145,3 +137,10 @@ jobs:
           draft: false
           prerelease: true
           files: cli/runtipi-cli-*
+
+  e2e-tests:
+    needs: [create-tag, publish-release]
+    uses: "./.github/workflows/e2e.yml"
+    secrets: inherit
+    with:
+      version: ${{ needs.create-tag.outputs.tagname }}

.github/workflows/beta-release.yml

@@ -8,6 +8,14 @@ on:
         required: true
 
 jobs:
+  integration-tests:
+    uses: "./.github/workflows/integration-tests.yml"
+    secrets: inherit
+
+  unit-tests:
+    uses: "./.github/workflows/ci.yml"
+    secrets: inherit
+
   create-tag:
     runs-on: ubuntu-latest
     outputs:
@@ -22,20 +30,13 @@ jobs:
           VERSION=$(npm run version --silent)
           echo "tagname=v${VERSION}-beta.${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
 
-      - uses: rickstaa/action-create-tag@v1
-        with:
-          tag: ${{ steps.get_tag.outputs.tagname }}
-
   build-images:
     needs: create-tag
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -89,7 +90,7 @@ jobs:
           repo: cli
           owner: runtipi
           run_id: ${{ steps.return_dispatch.outputs.run_id }}
-          run_timeout_seconds: 300
+          run_timeout_seconds: 1200
           poll_interval_ms: 5000
 
       - name: Create bin folder

.github/workflows/ci.yml

@@ -1,6 +1,10 @@
 name: Tipi CI
 on:
+  workflow_call:
   pull_request:
+  push:
+    branches:
+      - develop
 
 env:
   ROOT_FOLDER: /runtipi
@@ -23,19 +27,6 @@ env:
 jobs:
   tests:
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:14
-        env:
-          POSTGRES_PASSWORD: postgres
-        ports:
-          - 5433:5432
-        # set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -49,7 +40,7 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 9.4.0
+          version: 9.12.2
           run_install: false
 
       - name: Get pnpm store directory
@@ -69,17 +60,10 @@ jobs:
         run: pnpm install
 
       - name: Run biome tests
-        run: pnpm biome check
-
-      - name: Get number of CPU cores
-        id: cpu-cores
-        uses: SimenB/github-actions-cpu-cores@v2
+        run: pnpm lint:ci
 
       - name: Run tests
-        run: pnpm run test --max-workers ${{ steps.cpu-cores.outputs.count }}
-
-      - name: Run packages tests
-        run: pnpm -r test
+        run: pnpm test
 
   build:
     runs-on: ubuntu-latest
@@ -96,7 +80,7 @@ jobs:
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 9.4.0
+          version: 9.12.2
           run_install: false
 
       - name: Get pnpm store directory
@@ -116,10 +100,7 @@ jobs:
         run: pnpm install
 
       - name: Build client
-        run: npm run build
+        run: npm run bundle
 
       - name: Run tsc
-        run: pnpm run tsc
-
-      - name: Run packages tsc
         run: pnpm -r run tsc

.github/workflows/e2e.yml

@@ -5,7 +5,7 @@ on:
       version:
         required: true
         type: string
-        description: 'Version to test (e.g. v1.6.0-beta.1)'
+        description: "Version to test (e.g. v1.6.0-beta.1)"
   workflow_dispatch:
 
 jobs:
@@ -16,8 +16,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          version: "lab:latest"
+          driver: cloud
+          endpoint: "runtipi/runtipi-cloud-builder"
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -36,8 +46,6 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: ghcr.io/runtipi/runtipi:e2e
-          cache-from: type=registry,ref=ghcr.io/runtipi/runtipi:buildcache
-          cache-to: type=registry,ref=ghcr.io/runtipi/runtipi:buildcache,mode=max
 
       - name: Create cli folder
         run: mkdir -p bin
@@ -79,24 +87,28 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Create .env.local
+        run: |
+          echo "LOG_LEVEL=debug" > .env.local
+
       - name: Run install script
         if: ${{ inputs.version }}
         run: |
           curl -s https://raw.githubusercontent.com/runtipi/runtipi/${{ inputs.version }}/scripts/install.sh > install.sh
           chmod +x install.sh
-          ./install.sh --version ${{ inputs.version }} --asset runtipi-cli-linux-x86_64.tar.gz
+          ./install.sh --version ${{ inputs.version }} --asset runtipi-cli-linux-x86_64.tar.gz --env-file ${{ github.workspace }}/.env.local
 
       - name: Run install script
         if: ${{ !inputs.version }}
         run: |
-          ./scripts/install.sh --version e2e
+          ./scripts/install.sh --version e2e --env-file ${{ github.workspace }}/.env.local
           cd ..
 
       - uses: pnpm/[email protected]
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 9.4.0
+          version: 9.12.2
           run_install: false
 
       - name: Get pnpm store directory
@@ -112,7 +124,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Create .env.e2e file with Droplet IP
+      - name: Create .env.e2e file
         run: |
           echo "SERVER_IP=$(hostname -I | awk '{print $1}')" > .env.e2e
           echo "POSTGRES_PASSWORD=$(grep POSTGRES_PASSWORD runtipi/.env | cut -d '=' -f2)" >> .env.e2e
@@ -125,13 +137,31 @@ jobs:
         with:
           node-version: 20
 
+      - name: Get installed playwright version
+        id: playwright-version
+        run: echo "version=$(node -e "console.log(require('./package.json').devDependencies['@playwright/test'])")" >> $GITHUB_OUTPUT
+
+      - name: Cache Playwright binaries
+        id: cache-playwright-binaries
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.version }}
+
       - name: Install Playwright Browsers
+        if: steps.cache-playwright-binaries.outputs.cache-hit != 'true'
         run: npx playwright install --with-deps
 
       - name: Run Playwright tests
         id: run-e2e
         run: npm run test:e2e
 
+      - name: Dump app logs in playwright-report folder
+        if: always()
+        run: |
+          mkdir -p playwright-report
+          cp ./runtipi/logs/* playwright-report/
+
       - uses: actions/upload-artifact@v4
         if: always()
         with: