From 2951162865b3b7d1782173d3038fde5303c1e4e0 Mon Sep 17 00:00:00 2001
From: sugar <sugar@sylveon.social>
Date: Thu, 16 Jan 2025 20:51:12 +0100
Subject: [PATCH] use different test configuration file for forgejo

forgejo currently doesn't support port redirection, so it's necessary
for services to use their normal ports

the old file is kept for local usage
---
 .forgejo/misskey/test-forgejo.yml      | 16 ++++++++++++++++
 .forgejo/workflows/test-backend.yml    | 12 ++----------
 .forgejo/workflows/test-frontend.yml   |  2 +-
 .forgejo/workflows/test-production.yml |  2 +-
 4 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 .forgejo/misskey/test-forgejo.yml

diff --git a/.forgejo/misskey/test-forgejo.yml b/.forgejo/misskey/test-forgejo.yml
new file mode 100644
index 000000000..32cd9861d
--- /dev/null
+++ b/.forgejo/misskey/test-forgejo.yml
@@ -0,0 +1,16 @@
+# Workaround for Forgejo not supporting port redirection
+
+url: 'http://misskey.local'
+
+port: 61812
+
+db:
+  host: postgres
+  port: 5432
+  db: test-misskey
+  user: postgres
+  pass: ''
+redis:
+  host: dragonfly
+  port: 6379
+id: aidx
diff --git a/.forgejo/workflows/test-backend.yml b/.forgejo/workflows/test-backend.yml
index 652ff178d..cc5ae6d33 100644
--- a/.forgejo/workflows/test-backend.yml
+++ b/.forgejo/workflows/test-backend.yml
@@ -25,8 +25,6 @@ jobs:
     services:
       postgres:
         image: postgres:15
-        ports:
-          - 54312:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -42,8 +40,6 @@ jobs:
           DFLY_conn_io_threads: 4
           DFLY_epoll_file_threads: 4
           DFLY_proactor_threads: 4
-        ports:
-          - 56312:6379
 
     steps:
     - uses: actions/checkout@v4
@@ -65,7 +61,7 @@ jobs:
     - name: Check pnpm-lock.yaml
       run: git diff --exit-code pnpm-lock.yaml
     - name: Copy Configure
-      run: cp .forgejo/misskey/test.yml .config
+      run: cp .forgejo/misskey/test-forgejo.yml .config/test.yml
     - name: Build
       run: pnpm build
     - name: Test
@@ -81,8 +77,6 @@ jobs:
     services:
       postgres:
         image: postgres:15
-        ports:
-          - 54312:5432
         env:
           POSTGRES_DB: test-misskey
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -98,8 +92,6 @@ jobs:
           DFLY_conn_io_threads: 4
           DFLY_epoll_file_threads: 4
           DFLY_proactor_threads: 4
-        ports:
-          - 56312:6379
 
     steps:
       - uses: actions/checkout@v4
@@ -119,7 +111,7 @@ jobs:
       - name: Check pnpm-lock.yaml
         run: git diff --exit-code pnpm-lock.yaml
       - name: Copy Configure
-        run: cp .forgejo/misskey/test.yml .config
+        run: cp .forgejo/misskey/test-forgejo.yml .config/test.yml
       - name: Build
         run: pnpm build
       - name: Test
diff --git a/.forgejo/workflows/test-frontend.yml b/.forgejo/workflows/test-frontend.yml
index 66f90179b..d7baf4b32 100644
--- a/.forgejo/workflows/test-frontend.yml
+++ b/.forgejo/workflows/test-frontend.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Check pnpm-lock.yaml
       run: git diff --exit-code pnpm-lock.yaml
     - name: Copy Configure
-      run: cp .forgejo/misskey/test.yml .config
+      run: cp .forgejo/misskey/test-forgejo.yml .config/test.yml
     - name: Build
       run: pnpm build
     - name: Test
diff --git a/.forgejo/workflows/test-production.yml b/.forgejo/workflows/test-production.yml
index 776341249..56c075577 100644
--- a/.forgejo/workflows/test-production.yml
+++ b/.forgejo/workflows/test-production.yml
@@ -35,6 +35,6 @@ jobs:
     - name: Check pnpm-lock.yaml
       run: git diff --exit-code pnpm-lock.yaml
     - name: Copy Configure
-      run: cp .forgejo/misskey/test.yml .config/default.yml
+      run: cp .forgejo/misskey/test-forgejo.yml .config/default.yml
     - name: Build
       run: pnpm build