fix(ci): test container not being pushed (#63)

Author: MarkusJx

.github/workflows/asan.yml

@@ -8,36 +8,62 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
-
+            - name: Checkout
+              uses: actions/checkout@v3
             - name: Setup node
               uses: actions/[email protected]
               with:
                   node-version: 18
                   check-latest: true
                   cache: 'npm'
+            - name: Setup java 17
+              uses: actions/setup-java@v3
+              with:
+                  distribution: 'temurin'
+                  java-version: '17'
+
+            - name: Rust Cache
+              uses: Swatinem/[email protected]
+            - name: Cache java definitions
+              uses: actions/cache@v3
+              with:
+                  path: '**/test/javaDefinitions'
+                  key: ${{runner.os}}-javaDefinitions
 
             - name: Install dependencies
               run: npm ci
+            - name: Build
+              run: npm run build
+            - name: Generate test types
+              run: npm run generateTestTypes -- --system-test
+            - name: Remove target and dist directories
+              run: |
+                  rm -rf dist
+                  mv target target.bak
+                  cp -r test/javaDefinitions javaDefinitions.bak
 
             - name: Run tests with address sanitizer
               uses: addnab/docker-run-action@v3
               with:
                   registry: gcr.io
-                  image: ghcr.io/markusjx/prebuilt-debug-jdk:17-bullseye
+                  image: ghcr.io/markusjx/node-java-bridge/java-bridge-asan-testcontainer:latest
                   options: -v ${{ github.workspace }}:/app
                   run: |
-                      curl -fsSL https://deb.nodesource.com/setup_18.x | bash - >> /dev/null
-                      apt-get install -yqq nodejs
-                      cargo update
                       npm run build:napi:debug -- --target=x86_64-unknown-linux-gnu \
                         --cargo-flags="-Zbuild-std"
-                      npm run postbuild
+                      npm run build:ts
+                      npm run generateTestTypes -- --update-imports
+                      npm run mocha -- --timeout 10000
 
-                      export LD_PRELOAD=$(clang -print-file-name=libclang_rt.asan-x86_64.so)
-                      export RUST_BACKTRACE=1
-                      export FORCE_RUN_ALL_TESTS=true
-                      export INCREASE_TIMEOUT=true
-                      export SKIP_CLASS_TEST=true
-                      export DEBUG='napi:*'
-                      npm run testOnly
+            - name: Create test summary
+              uses: test-summary/action@dist
+              if: always()
+              with:
+                  show: all
+                  paths: testResults.xml
+            - name: Move target back
+              run: |
+                  sudo rm -rf target
+                  mv target.bak target
+                  sudo rm -rf test/javaDefinitions
+                  mv javaDefinitions.bak test/javaDefinitions

.github/workflows/system_test.yml

@@ -44,7 +44,7 @@ jobs:
               run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             - name: Run tests
               uses: addnab/docker-run-action@v3
-              timeout-minutes: 120
+              timeout-minutes: 180
               with:
                   image: arm64v8/node:${{matrix.node-version}}-bullseye
                   options: -v ${{github.workspace}}/test:/github/workspace -w /github/workspace/system_test

.github/workflows/test-container.yml

@@ -38,7 +38,6 @@ jobs:
             - name: Log into registry
               run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login $REGISTRY -u ${{ github.actor }} --password-stdin
             - name: Push latest image
-              if: ${{github.event.inputs.set-latest == 'true'}}
               run: |
                   IMAGE_ID=$REGISTRY/${{ github.repository }}
                   IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')/$IMAGE_NAME

.github/workflows/test.yml

@@ -147,7 +147,7 @@ jobs:
               run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             - name: Run tests
               uses: addnab/docker-run-action@v3
-              timeout-minutes: 120
+              timeout-minutes: 180
               with:
                   image: arm64v8/node:${{matrix.node-version}}-bullseye
                   options: -v ${{ github.workspace }}:/github/workspace -w /github/workspace

package.json

@@ -56,8 +56,9 @@
         "build:java:win32": "cd java-src && .\\gradlew.bat shadowJar",
         "prepublishOnly": "napi prepublish -t npm",
         "test": "npm run testOnly",
-        "testOnly": "mocha -r ts-node/register test/*.test.ts --reporter mocha-multi-reporters --reporter-options configFile=mocha-reporter-config.json",
+        "testOnly": "npm run mocha",
         "pretestOnly": "npm run generateTestTypes",
+        "mocha": "mocha -r ts-node/register test/*.test.ts --reporter mocha-multi-reporters --reporter-options configFile=mocha-reporter-config.json",
         "pretest": "npm run build",
         "version": "napi version",
         "prettier": "prettier --write .",

test/ArrayListTest.test.ts

@@ -3,7 +3,7 @@ import { it } from 'mocha';
 import { expect } from 'chai';
 import { shouldIncreaseTimeout } from './testUtil';
 
-const timeout = shouldIncreaseTimeout ? 10e3 : 2e3;
+const timeout = shouldIncreaseTimeout ? 20e3 : 2e3;
 
 declare class ListClass<T extends JavaType> extends JavaClass {
     containsSync(element: T): boolean;

test/Dockerfile-test-template.hbs

@@ -18,6 +18,11 @@ ENV JAVA_HOME=/jdk
 ENV RUSTFLAGS="-Clinker=clang -Zsanitizer=address"
 ENV RUSTDOCFLAGS="-Clinker=clang -Zsanitizer=address"
 ENV ASAN_OPTIONS="detect_leaks=0"
+ENV RUST_BACKTRACE=1
+ENV FORCE_RUN_ALL_TESTS=true
+ENV INCREASE_TIMEOUT=true
+#ENV SKIP_CLASS_TEST=true
+ENV CI=true
 ENV PATH="$PATH:/root/.cargo/bin:/jdk/bin:/nodejs/node:/nodejs/npm"
 
 WORKDIR /app

test/generateTestTypes.ts

@@ -5,6 +5,8 @@ import type { Ora } from 'ora';
 import isCi from 'is-ci';
 import type { ChalkInstance } from 'chalk';
 import { hashElement } from 'folder-hash';
+import { glob as _glob } from 'glob';
+import { promisify } from 'util';
 
 const isSystemTest = process.argv.includes('--system-test');
 
@@ -130,8 +132,37 @@ async function run() {
     spinner?.succeed('Generated Java definitions');
 }
 
-run().catch((err) => {
-    spinner?.fail('Failed to convert classes');
-    console.error(err);
-    process.exit(1);
-});
+async function updateImports(): Promise<void> {
+    console.log('Updating imports');
+
+    const glob = promisify(_glob);
+    await Promise.all(
+        (
+            await glob('**/*.ts', { cwd: outDir })
+        )
+            .map((file) => path.join(outDir, file))
+            .map(async (file) => {
+                const contents = await fs.promises.readFile(file, 'utf8');
+                await fs.promises.writeFile(
+                    file,
+                    contents.replaceAll(
+                        'from "java-bridge";',
+                        `from ${JSON.stringify(path.join(__dirname, '..'))};`
+                    )
+                );
+            })
+    );
+}
+
+if (process.argv.includes('--update-imports')) {
+    updateImports().catch((err) => {
+        console.error(err);
+        process.exit(1);
+    });
+} else {
+    run().catch((err) => {
+        spinner?.fail('Failed to convert classes');
+        console.error(err);
+        process.exit(1);
+    });
+}