Merge branch 'TryGhost:main' into main

Lekler · Sep 23, 2024 · 8d36f76 · 8d36f76
2 parents be93b06 + 577362a
commit 8d36f76
Show file tree

Hide file tree

Showing 319 changed files with 11,663 additions and 3,133 deletions.
diff --git a/.github/scripts/dev.js b/.github/scripts/dev.js
@@ -58,6 +58,14 @@ const COMMAND_ADMIN = {
     env: {}
 };
 
+const COMMAND_BROWSERTESTS = {
+    name: 'browser-tests',
+    command: 'nx run ghost:test:browser',
+    cwd: path.resolve(__dirname, '../../ghost/core'),
+    prefixColor: 'blue',
+    env: {}
+};
+
 const COMMAND_TYPESCRIPT = {
     name: 'ts',
     command: `while [ 1 ]; do nx watch --projects=${tsPackages} -- nx run \\$NX_PROJECT_NAME:build:ts; done`,
@@ -86,6 +94,8 @@ if (DASH_DASH_ARGS.includes('ghost')) {
     commands = [COMMAND_GHOST, COMMAND_TYPESCRIPT];
 } else if (DASH_DASH_ARGS.includes('admin')) {
     commands = [COMMAND_ADMIN, ...COMMANDS_ADMINX];
+} else if (DASH_DASH_ARGS.includes('browser-tests')) {
+    commands = [COMMAND_BROWSERTESTS, COMMAND_TYPESCRIPT];
 } else {
     commands = [COMMAND_GHOST, COMMAND_TYPESCRIPT, COMMAND_ADMIN, ...COMMANDS_ADMINX];
 }
@@ -186,7 +196,7 @@ if (DASH_DASH_ARGS.includes('comments') || DASH_DASH_ARGS.includes('all')) {
 
 async function handleStripe() {
     if (DASH_DASH_ARGS.includes('stripe') || DASH_DASH_ARGS.includes('all')) {
-        if (DASH_DASH_ARGS.includes('offline')) {
+        if (DASH_DASH_ARGS.includes('offline') || DASH_DASH_ARGS.includes('browser-tests')) {
             return;
         }
 

diff --git a/.github/scripts/docker-compose.yml b/.github/scripts/docker-compose.yml
@@ -17,6 +17,7 @@ services:
     volumes:
       # Turns out you can drop .sql or .sql.gz files in here, cool!
       - ./mysql-preload:/docker-entrypoint-initdb.d
+      - mysql-data:/var/lib/mysql
     healthcheck:
       test: "mysql -uroot -proot ghost -e 'select 1'"
       interval: 1s
@@ -27,13 +28,5 @@ services:
     ports:
       - "6379:6379"
     restart: always
-  jaeger:
-      image: jaegertracing/all-in-one:1.58
-      container_name: ghost-jaeger
-      ports:
-        - "4318:4318"
-        - "16686:16686"
-        - "9411:9411"
-      restart: always
-      environment:
-        COLLECTOR_ZIPKIN_HOST_PORT: :9411
+volumes:
+  mysql-data: