Merge branch 'CMU-17313Q:main' into fixing-complexity-issues-in-bookmarks

Author: nniknam1

.github/workflows/docker.yml

@@ -4,7 +4,7 @@ name: Run Docker
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
       - 'v*.x'
     tags:
       - 'v*'

.github/workflows/test.yaml

@@ -3,10 +3,12 @@ name: Lint and test
 on:
   push:
     branches:
+      - main
       - master
       - develop
   pull_request:
     branches:
+      - main
       - master
       - develop
 
@@ -19,49 +21,11 @@ permissions:
 
 jobs:
   test:
-    permissions:
-      checks: write  # for coverallsapp/github-action to create new checks
-      contents: read  # for actions/checkout to fetch code
-    name: Lint and test
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        node: [20, 22]
-        database: [mongo-dev, mongo, redis, postgres]
-        include:
-          # only run coverage once
-          - os: ubuntu-latest
-            node: 22
-            coverage: true
-          # test under development once
-          - database: mongo-dev
-            test_env: development
-          # only run eslint once
-          - os: ubuntu-latest
-            node: 22
-            database: mongo-dev
-            lint: true
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     env:
-      TEST_ENV: ${{ matrix.test_env || 'production' }}
+      TEST_ENV: 'production'
 
     services:
-      postgres:
-        image: 'postgres:17-alpine'
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps port 5432 on service container to the host
-          - 5432:5432
-
       redis:
         image: 'redis:8.0.1'
         # Set health checks to wait until redis has started
@@ -74,12 +38,6 @@ jobs:
           # Maps port 6379 on service container to the host
           - 6379:6379
 
-      mongo:
-        image: 'mongo:8.0'
-        ports:
-          # Maps port 27017 on service container to the host
-          - 27017:27017
-
     steps:
       - uses: actions/checkout@v4
 
@@ -88,74 +46,14 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node }}
+          node-version: 22
 
       - name: NPM Install
         uses: bahmutov/npm-install@v1
         with:
           useLockFile: false
 
-      - name: Setup on MongoDB
-        if: startsWith(matrix.database, 'mongo')
-        env:
-          SETUP: >-
-            {
-              "url": "http://127.0.0.1:4567",
-              "secret": "abcdef",
-              "admin:username": "admin",
-              "admin:email": "test@example.org",
-              "admin:password": "hAN3Eg8W",
-              "admin:password:confirm": "hAN3Eg8W",
-
-              "database": "mongo",
-              "mongo:host": "127.0.0.1",
-              "mongo:port": 27017,
-              "mongo:username": "",
-              "mongo:password": "",
-              "mongo:database": "nodebb"
-            }
-          CI: >-
-            {
-              "host": "127.0.0.1",
-              "port": 27017,
-              "database": "ci_test"
-            }
-        run: |
-          node app --setup="${SETUP}" --ci="${CI}"
-
-      - name: Setup on PostgreSQL
-        if: startsWith(matrix.database, 'postgres')
-        env:
-          SETUP: >-
-            {
-              "url": "http://127.0.0.1:4567",
-              "secret": "abcdef",
-              "admin:username": "admin",
-              "admin:email": "test@example.org",
-              "admin:password": "hAN3Eg8W",
-              "admin:password:confirm": "hAN3Eg8W",
-
-              "database": "postgres",
-              "postgres:host": "127.0.0.1",
-              "postgres:port": 5432,
-              "postgres:username": "postgres",
-              "postgres:password": "postgres",
-              "postgres:database": "nodebb"
-            }
-          CI: >-
-            {
-              "host": "127.0.0.1",
-              "database": "ci_test",
-              "port": 5432,
-              "username": "postgres",
-              "password": "postgres"
-            }
-        run: |
-          node -e "const { Client } = require('pg'); const c = new Client({ host: '127.0.0.1', port: 5432, user: 'postgres', password: 'postgres' }); c.connect().then(() => c.query('CREATE DATABASE nodebb')).then(() => c.query('CREATE DATABASE ci_test')).then(() => c.end())"
-          node app --setup="${SETUP}" --ci="${CI}"
-
       - name: Setup on Redis
-        if: startsWith(matrix.database, 'redis')
         env:
           SETUP: >-
             {
@@ -182,7 +80,6 @@ jobs:
           node app --setup="${SETUP}" --ci="${CI}"
 
       - name: Run ESLint
-        if: matrix.lint
         run: npm run lint
 
       - name: Node tests
@@ -192,21 +89,4 @@ jobs:
         run: npm run coverage
 
       - name: Test coverage
-        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
-        if: matrix.coverage
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          flag-name: ${{ matrix.os }}-node-${{ matrix.node }}-db-${{ matrix.database }}
-          parallel: true
-
-  finish:
-    permissions:
-      checks: write  # for coverallsapp/github-action to create new checks
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Coveralls Finished
-        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          parallel-finished: true
+        uses: coverallsapp/github-action@v2

test/file.js

@@ -60,7 +60,7 @@ describe('file', () => {
 			});
 		});
 
-		it('should error if existing file is read only', (done) => {
+		it.skip('should error if existing file is read only', (done) => {
 			fs.writeFileSync(uploadPath, 'hsdkjhgkjsfhkgj');
 			fs.chmodSync(uploadPath, '444');