Merge pull request #1256 from gettakaro/main-promotion

🤖 Merge development into main
gettakaro · Sep 8, 2024 · 5c4713b · 5c4713b
2 parents 19a669e + 4bd0cb8
commit 5c4713b
Show file tree

Hide file tree

Showing 124 changed files with 1,119 additions and 1,612 deletions.
diff --git a/.github/workflows/dev-to-main-pr.yml b/.github/workflows/dev-to-main-pr.yml
@@ -34,7 +34,7 @@ jobs:
           branch: main-promotion
           labels: skip-changelog
           token: ${{ steps.generate_token.outputs.token }}
-          title: Merge development into main
+          title: 🤖 Merge development into main
           body: |
             This PR merges the development branch into the main branch.
             It is created automatically by the Takaro CI bot.

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -130,13 +130,20 @@ jobs:
       - name: Commit and push if changed
         if: github.ref == 'refs/heads/development'
         run: |
+          # Check if there are any changes
           if git diff --quiet; then
             echo "No changes to commit."
           else
-            git config --global user.name 'takaro-ci-bot[bot]'
-            git config --global user.email '138661031+takaro-ci-bot[bot]@users.noreply.github.com'
-            git commit -am "chore: generate api client"
-            git push
+            # Check if the last commit was made by the CI bot
+            LAST_AUTHOR=$(git log -1 --pretty=format:'%an')
+            if [ "$LAST_AUTHOR" = "takaro-ci-bot[bot]" ]; then
+              echo "Last commit was made by the CI bot. Skipping commit."
+            else
+              git config --global user.name 'takaro-ci-bot[bot]'
+              git config --global user.email '138661031+takaro-ci-bot[bot]@users.noreply.github.com'
+              git commit -am "chore: generate api client"
+              git push
+            fi
           fi
 
       - uses: actions/upload-artifact@v4
@@ -145,26 +152,26 @@ jobs:
           name: integrationTests
           path: reports
           retention-days: 30
-#  e2e:
-#    needs: [docker]
-#    timeout-minutes: 60
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v4
-#      - uses: actions/setup-node@v4
-#        with:
-#          node-version: 18.18
-#      - run: ./scripts/dev-init.sh
-#      - name: Install Playwright Browsers
-#        run: npx playwright install --with-deps
-#      - name: Integration tests e2e
-#        run: npx zx scripts/integration-tests.mjs
-#        env:
-#          DOCKER_TAG: ${{ needs.docker.outputs.docker_tag }}
-#          IS_E2E: true
-#      - uses: actions/upload-artifact@v3
-#        if: always()
-#        with:
-#          name: e2e
-#          path: reports
-#          retention-days: 30
+  e2e:
+    needs: [docker]
+    timeout-minutes: 60
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: ./scripts/dev-init.sh
+      - name: Install Playwright Browsers
+        run: npx playwright install --with-deps
+      - name: Integration tests e2e
+        run: npx zx scripts/integration-tests.mjs
+        env:
+          DOCKER_TAG: ${{ needs.docker.outputs.docker_tag }}
+          IS_E2E: true
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: e2e
+          path: reports
+          retention-days: 30
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -103,6 +103,8 @@ services:
     environment:
       VITE_API: http://127.0.0.1:13000
       VITE_ORY_URL: http://127.0.0.1:4433
+      VITE_POSTHOG_PUBLIC_API_KEY: "placeholder"
+      VITE_POSTHOG_API_URL: "placeholder"
     ports:
       - 13001:80