Merge pull request #421 from ssbc/actions_update

mixmix · web-flow · commit 93ca3c1b33d9 · 2023-04-19T10:40:58.000+12:00
Actions: update checkout + node-setup verisons
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -17,7 +17,7 @@ jobs:
   licenses:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: REUSE Compliance Check
         uses: fsfe/reuse-action@v1
 
@@ -30,9 +30,9 @@ jobs:
         node-version: [16.x, 18.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install
@@ -43,26 +43,25 @@ jobs:
     needs: test
 
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 16.x
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - run: npm install
       - name: Benchmark
         run: npm run benchmark
       - id: get-comment-body
         name: Gather results
         run: |
-          body=$(cat /tmp/ssb-db2-benchmark/benchmark.md)
-          body="${body//'%'/'%25'}"
-          body="${body//$'\n'/'%0A'}"
-          body="${body//$'\r'/'%0D'}"
-          echo ::set-output name=body::$body
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          echo "BENCHMARK_OUTPUT<<$EOF" >> $GITHUB_OUTPUT
+          cat /tmp/ssb-db2-benchmark/benchmark.md >> $GITHUB_OUTPUT
+          echo "$EOF" >> $GITHUB_OUTPUT
       - name: Publish comment
-        uses: mshick/add-pr-comment@v1
+        uses: mshick/add-pr-comment@v2
         with:
-          message: ${{ steps.get-comment-body.outputs.body }}
+          message: ${{ steps.get-comment-body.outputs.BENCHMARK_OUTPUT }}
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+          allow-repeats: true
diff --git a/test/basic.js b/test/basic.js
@@ -663,5 +663,5 @@ test('getMsg from uri id', (t) => {
 })
 
 test('teardown', (t) => {
-  sbot.close(t.end)
+  sbot.close(true, () => t.end())
 })
diff --git a/test/compat.js b/test/compat.js
@@ -18,7 +18,7 @@ mkdirp.sync(dir)
 
 const keys = ssbKeys.loadOrCreateSync(path.join(dir, 'secret'))
 
-let sbot = SecretStack({ appKey: caps.shs })
+const sbot = SecretStack({ appKey: caps.shs })
   .use(require('../'))
   .use(require('../compat/db'))
   .call(null, {
@@ -58,5 +58,5 @@ test('keys', (t) => {
 })
 
 test('teardown sbot', (t) => {
-  sbot.close(() => t.end())
+  sbot.close(true, () => t.end())
 })
diff --git a/test/create.js b/test/create.js
@@ -596,5 +596,5 @@ test('addTransaction classic and buttwoo', (t) => {
 })
 
 test('teardown', (t) => {
-  sbot.close(t.end)
+  sbot.close(true, () => t.end())
 })
diff --git a/test/createHistoryStream.js b/test/createHistoryStream.js
@@ -212,7 +212,7 @@ test('Encrypted', (t) => {
       pull.collect((err, results) => {
         t.equal(results.length, 4)
         t.equal(typeof results[3].content, 'string')
-        sbot.close(t.end)
+        sbot.close(true, () => t.end())
       })
     )
   })
diff --git a/test/createLogStream.js b/test/createLogStream.js
@@ -164,5 +164,5 @@ test.skip('createLogStream (gt)', (t) => {
 })
 
 test('teardown sbot', (t) => {
-  sbot.close(() => t.end())
+  sbot.close(true, () => t.end())
 })
diff --git a/test/delete.js b/test/delete.js
@@ -103,5 +103,5 @@ test('delete a bunch', async (t) => {
 })
 
 test('teardown', (t) => {
-  sbot.close(t.end)
+  sbot.close(true, () => t.end())
 })
diff --git a/test/ebt.js b/test/ebt.js
@@ -169,5 +169,5 @@ test('buttwoo-v1 sequenceNativeMsg', (t) => {
 })
 
 test('teardown sbot', (t) => {
-  sbot.close(true, t.end)
+  sbot.close(true, () => t.end())
 })
diff --git a/test/feedstate.js b/test/feedstate.js
@@ -36,7 +36,7 @@ test('Base', (t) => {
       t.error(err)
       t.equal(state.id, postMsg.key)
       t.equal(state.sequence, postMsg.value.sequence)
-      sbot.close(t.end)
+      sbot.close(true, () => t.end())
     })
   })
 })
diff --git a/test/full-mentions.js b/test/full-mentions.js
@@ -110,5 +110,5 @@ test('getMessagesByMention live', { timeout: 5000 }, (t) => {
 })
 
 test('teardown sbot', (t) => {
-  sbot.close(() => t.end())
+  sbot.close(true, () => t.end())
 })
diff --git a/test/index-upgrade.js b/test/index-upgrade.js
@@ -84,7 +84,7 @@ test('1 index first', (t) => {
       sbot.db.getIndex('indextest').getValue(msgKey, (err, value) => {
         t.error(err, 'no err')
         t.equal(value, '1', 'correct initial value')
-        sbot.close(t.end)
+        sbot.close(true, () => t.end())
       })
     })
   })
diff --git a/test/migration.js b/test/migration.js
@@ -66,7 +66,7 @@ test('migrate moves msgs from old log to new log', (t) => {
           toCallback((err1, msgs) => {
             t.error(err1, 'no err')
             t.equal(msgs.length, M)
-            sbot.close(t.end)
+            sbot.close(true, () => t.end())
           })
         )
       })
@@ -103,7 +103,7 @@ test('migrate moves msgs from ssb-db to new log', (t) => {
           toCallback((err1, msgs) => {
             t.error(err1, 'no err')
             t.equal(msgs.length, M)
-            sbot.close(t.end)
+            sbot.close(true, () => t.end())
           })
         )
       })
@@ -142,7 +142,7 @@ test('migrate keeps new log synced with ssb-db being updated', (t) => {
                 t.error(err3, '2nd query suceeded')
                 t.equal(msgs2.length, M + 1, `${M + 1} msgs`)
                 t.equal(msgs2[M].value.content.text, 'Extra post')
-                sbot.close(t.end)
+                sbot.close(true, () => t.end())
               })
             )
           }, 200)
@@ -184,7 +184,7 @@ test('test migrate with encrypted messages', (t) => {
         t.error(err, 'no err')
         t.equal(msgs.length, 2)
         t.equal(msgs[1].value.content.text, 'super secret')
-        sbot.close(t.end)
+        sbot.close(true, () => t.end())
       })
     )
   })
@@ -211,7 +211,7 @@ test('refuses to db2.add() while old log exists', (t) => {
           err.message.includes('refusing to create() because the old log'),
           'error message is about the old log'
         )
-        sbot.close(t.end)
+        sbot.close(true, () => t.end())
       })
     })
   )
@@ -273,7 +273,7 @@ test('dangerouslyKillFlumeWhenMigrated and refusing db2.publish()', (t) => {
           toCallback((err1, msgs) => {
             t.error(err1, 'no err when querying')
             t.equal(msgs.length, M, `there are ${M} msgs`)
-            sbot.close(t.end)
+            sbot.close(true, () => t.end())
           })
         )
       }, 300)
@@ -294,7 +294,7 @@ test('migrate does nothing when there is no old log', (t) => {
 
   setTimeout(() => {
     t.pass('did nothing')
-    sbot.close(t.end)
+    sbot.close(true, () => t.end())
   }, 1000)
 
   pull(
@@ -373,13 +373,13 @@ test('migrate fixes buffers in msg.value.content.nonce', (t) => {
                   if (msg.value.content.nonce) {
                     if (!Buffer.isBuffer(msg.value.content.nonce)) {
                       t.fail('one of the nonces is not a Buffer')
-                      sbot.close(t.end)
+                      sbot.close(true, () => t.end())
                       return
                     }
                   }
                 }
                 t.pass('all Buffers in bendy butt were treated correctly')
-                sbot.close(t.end)
+                sbot.close(true, () => t.end())
               })
             )
           })
diff --git a/test/multiple-indexes.js b/test/multiple-indexes.js
@@ -36,7 +36,7 @@ test('1 index first', (t) => {
     t.error(err, 'no err')
 
     db.onDrain('fullMentions', () => {
-      sbot.close(t.end)
+      sbot.close(true, () => t.end())
     })
   })
 })
@@ -68,7 +68,7 @@ test('second index', (t) => {
         t.error(err, 'no err')
         t.equal(results.length, 1)
         t.equal(results[0].value.content.text, mentionFeed.text)
-        sbot.close(t.end)
+        sbot.close(true, () => t.end())
       })
     )
   })
diff --git a/test/operators.js b/test/operators.js
@@ -712,5 +712,5 @@ test('live alone', (t) => {
 })
 
 test('teardown sbot', (t) => {
-  sbot.close(() => t.end())
+  sbot.close(true, () => t.end())
 })
diff --git a/test/private-without-query.js b/test/private-without-query.js
@@ -17,10 +17,12 @@ mkdirp.sync(dir)
 
 const keys = ssbKeys.loadOrCreateSync(path.join(dir, 'secret'))
 
-let sbot = SecretStack({ appKey: caps.shs }).use(require('../')).call(null, {
-  keys,
-  path: dir,
-})
+const sbot = SecretStack({ appKey: caps.shs })
+  .use(require('../'))
+  .call(null, {
+    keys,
+    path: dir,
+  })
 const db = sbot.db
 
 test('private index shows in status', (t) => {
@@ -38,5 +40,5 @@ test('private index shows in status', (t) => {
 })
 
 test('teardown', (t) => {
-  sbot.close(t.end)
+  sbot.close(true, () => t.end())
 })
diff --git a/test/private.js b/test/private.js
@@ -102,5 +102,5 @@ test('encrypted index can handle deleted records', (t) => {
 })
 
 test('teardown', (t) => {
-  sbot.close(t.end)
+  sbot.close(true, () => t.end())
 })
diff --git a/test/query-decrypted-box2.js b/test/query-decrypted-box2.js
@@ -70,8 +70,8 @@ test('decrypted api contains newly decrypted box2 messages', (t) => {
       pull.drain(
         (result) => {
           t.equal(result.value.content.text, 'Testing!')
-          sbot.close(() => {
-            sbot2.close(t.end)
+          sbot.close(true, () => {
+            sbot2.close(true, () => t.end())
           })
         }
       )
diff --git a/test/query-waits-migrate.js b/test/query-waits-migrate.js
@@ -59,9 +59,7 @@ test('query() waits for migrate to sync old and new logs', (t) => {
       t.true(response.total > 0, 'total > 0')
       t.ok(response.results[0])
       t.true(response.results[0].value.content.text.includes('LATESTMSG'))
-      sbot.close(() => {
-        t.end()
-      })
+      sbot.close(true, () => t.end()) 
     })
   )
 })
diff --git a/test/validate.js b/test/validate.js
@@ -214,7 +214,7 @@ test('add fail case', (t) => {
     db.add(msg3, (err) => {
       t.ok(err, 'Should fail to add')
 
-      sbot.close(t.end)
+      sbot.close(true, () => t.end())
     })
   })
 })

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ test('Encrypted', (t) => {`
`212`	`212`	`pull.collect((err, results) => {`
`213`	`213`	`t.equal(results.length, 4)`
`214`	`214`	`t.equal(typeof results[3].content, 'string')`
`215`		`- sbot.close(t.end)`
	`215`	`+ sbot.close(true, () => t.end())`
`216`	`216`	`})`
`217`	`217`	`)`
`218`	`218`	`})`