Fix CI paths

Author: MadLittleMods

.github/workflows/tests.yml

@@ -707,28 +707,28 @@ jobs:
           cache-dependency-path: complement/go.sum
           go-version-file: complement/go.mod
 
-      # - name: Run Complement Tests
-      #   id: run_complement_tests
-      #   # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes
-      #   #     are underpowered and don't like running tons of Synapse instances at once.
-      #   # -json: Output JSON format so that gotestfmt can parse it.
-      #   #
-      #   # tee /tmp/gotest-complement.log: We tee the output to a file so that we can re-process it
-      #   # later on for better formatting with gotestfmt. But we still want the command
-      #   # to output to the terminal as it runs so we can see what's happening in
-      #   # real-time.
-      #   run: |
-      #     set -o pipefail
-      #     COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json 2>&1 | tee /tmp/gotest-complement.log
-      #   shell: bash
-      #   env:
-      #     POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }}
-      #     WORKERS: ${{ (matrix.arrangement == 'workers') && 1 || '' }}
-
-      # - name: Formatted Complement test logs
-      #   # Always run this step if we attempted to run the Complement tests.
-      #   if: always() && steps.run_complement_tests.outcome != 'skipped'
-      #   run: cat /tmp/gotest-complement.log | gotestfmt -hide "successful-downloads,empty-packages"
+      - name: Run Complement Tests
+        id: run_complement_tests
+        # -p=1: We're using `-p 1` to force the test packages to run serially as GHA boxes
+        #     are underpowered and don't like running tons of Synapse instances at once.
+        # -json: Output JSON format so that gotestfmt can parse it.
+        #
+        # tee /tmp/gotest-complement.log: We tee the output to a file so that we can re-process it
+        # later on for better formatting with gotestfmt. But we still want the command
+        # to output to the terminal as it runs so we can see what's happening in
+        # real-time.
+        run: |
+          set -o pipefail
+          COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json 2>&1 | tee /tmp/gotest-complement.log
+        shell: bash
+        env:
+          POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }}
+          WORKERS: ${{ (matrix.arrangement == 'workers') && 1 || '' }}
+
+      - name: Formatted Complement test logs
+        # Always run this step if we attempted to run the Complement tests.
+        if: always() && steps.run_complement_tests.outcome != 'skipped'
+        run: cat /tmp/gotest-complement.log | gotestfmt -hide "successful-downloads,empty-packages"
 
       - name: Run in-repo Complement Tests
         id: run_in_repo_complement_tests

scripts-dev/complement.sh

@@ -340,16 +340,8 @@ main() {
   set -x
 
   if [ -n "$use_in_repo_tests" ]; then
-    # TODO: Remove CI debug
-    echo "Script path: $0"
-    echo "Script dir: $(dirname "$0")"
-    echo "Current directory: $(pwd)"
-    echo "Looking for: $(dirname "$0")/../complement"
-    ls -la "$(dirname "$0")/../complement"
-
     # Run the suite of Complement tests in the `./complement` directory in this repo
-    in_repo_test_suite=${SUITE:-$(realpath $(dirname $0)/../complement)}
-    cd "$in_repo_test_suite"
+    cd "./complement"
     go test "${test_args[@]}" "$@" "${default_in_repo_complement_test_packages[@]}"
   else
     # Run the tests (from the Complement repo)!