DRY

Author: msimerson

.github/workflows/ci.yml

@@ -23,10 +23,6 @@ jobs:
           node-version: ${{ env.NODE_VER }}
       - uses: actions/checkout@v6
       - run: npm install
-      - name: Set MySQL credentials for CI
-        run: |
-          sed -i 's/^user\s*=.*/user = "root"/' conf.d/mysql.toml
-          sed -i 's/^password\s*=.*/password = "root"/' conf.d/mysql.toml
       - name: Initialize MySQL
         run: sh sql/init-mysql.sh
       - name: run coverage
@@ -68,10 +64,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: sh sql/init-mysql.sh
       - run: npm install
-      - name: Set MySQL credentials for CI
-        run: |
-          sed -i 's/^user\s*=.*/user = "root"/' conf.d/mysql.toml
-          sed -i 's/^password\s*=.*/password = "root"/' conf.d/mysql.toml
       - run: npm test
 
   test-mac:
@@ -93,10 +85,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: sh sql/init-mysql.sh
       - run: npm install
-      - name: Set MySQL credentials for CI
-        run: |
-          sed -i '' 's/^user[[:space:]]*=.*/user = "root"/' conf.d/mysql.toml
-          sed -i '' 's/^password[[:space:]]*=.*/password = "root"/' conf.d/mysql.toml
       - run: npm test
 
   test-win:
@@ -119,8 +107,4 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: sh sql/init-mysql.sh
       - run: npm install
-      - name: Set MySQL credentials for CI
-        run: |
-          sed -i 's/^user\s*=.*/user = "root"/' conf.d/mysql.toml
-          sed -i 's/^password\s*=.*/password = "root"/' conf.d/mysql.toml
       - run: sh test.sh

.github/workflows/publish.yml

@@ -19,10 +19,6 @@ jobs:
           node-version: ${{ env.node-version }}
       - run: sh sql/init-mysql.sh
       - run: npm install
-      - name: Set MySQL credentials for CI
-        run: |
-          sed -i 's/^user\s*=.*/user = "root"/' conf.d/mysql.toml
-          sed -i 's/^password\s*=.*/password = "root"/' conf.d/mysql.toml
       - run: npm test
 
   publish-npm:

conf.d/http.toml

@@ -15,4 +15,4 @@ clearInvalid = true
 isSameSite   = "Strict"
 isSecure     = true
 isHttpOnly   = false
-# password = ""   # hint: openssl rand -hex 16
+password     = ""   # hint: openssl rand -hex 16

test.sh

@@ -2,6 +2,11 @@
 
 set -eu
 
+if [ "${CI:-}" = "true" ]; then
+	sed -i.bak 's/^user[[:space:]]*=.*/user = "root"/' conf.d/mysql.toml && rm -f conf.d/mysql.toml.bak
+	sed -i.bak 's/^password[[:space:]]*=.*/password = "root"/' conf.d/mysql.toml && rm -f conf.d/mysql.toml.bak
+fi
+
 NODE="node --no-warnings=ExperimentalWarning"
 $NODE test-fixtures.js teardown
 $NODE test-fixtures.js setup