Skip to content

Commit

Permalink
Merge branch 'master' into ida613/baggage-extraction-patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ida613 authored Nov 26, 2024
2 parents a78ddd3 + 66f115c commit e35b27f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,11 @@ jobs:
# TODO: Figure out why nyc stopped working with EACCESS errors.
oracledb:
runs-on: ubuntu-latest
container: bengl/node-12-with-oracle-client
container:
image: bengl/node-12-with-oracle-client
volumes:
- /node20217:/node20217:rw,rshared
- /node20217:/__e/node20:ro,rshared
services:
oracledb:
image: gvenzl/oracle-xe:18-slim
Expand All @@ -827,6 +831,11 @@ jobs:
# Needed to fix issue with `actions/checkout@v3: https://github.com/actions/checkout/issues/1590
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
steps:
# https://github.com/actions/runner/issues/2906#issuecomment-2109514798
- name: Install Node for runner (with glibc 2.17 compatibility)
run: |
curl -LO https://unofficial-builds.nodejs.org/download/release/v20.9.0/node-v20.9.0-linux-x64-glibc-217.tar.xz
tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
Expand Down
14 changes: 6 additions & 8 deletions initialize.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import { isMainThread } from 'worker_threads'

import * as Module from 'node:module'
import { fileURLToPath } from 'node:url'
import {
load as origLoad,
Expand Down Expand Up @@ -49,12 +50,9 @@ export async function getSource (...args) {
}

if (isMainThread) {
// Need this IIFE for versions of Node.js without top-level await.
(async () => {
await import('./init.js')
const { register } = await import('node:module')
if (register) {
register('./loader-hook.mjs', import.meta.url)
}
})()
const require = Module.createRequire(import.meta.url)
require('./init.js')
if (Module.register) {
Module.register('./loader-hook.mjs', import.meta.url)
}
}

0 comments on commit e35b27f

Please sign in to comment.