From 92ae2cca1d46c45ddb07772bc1a24839d3875139 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Tue, 27 Jan 2026 20:58:47 +1300 Subject: [PATCH] Fixes to nodejsAndroid --- .github/workflows/prod-android.yml | 2 +- .github/workflows/pull-android.yml | 62 +++++++++++++++--------------- docs/BUILDING.md | 2 +- materialious/eslint.config.js | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index 5f0c1818..6e2d71f5 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -31,7 +31,7 @@ jobs: run: cd ../ && npm install - name: Build android nodejs packages - run: cd ../static/nodejs-android && npm install + run: cd ../static/nodejsAndroid && npm install - name: Build package run: cd ../ && npm run build diff --git a/.github/workflows/pull-android.yml b/.github/workflows/pull-android.yml index e7e7526c..63dbd5ba 100644 --- a/.github/workflows/pull-android.yml +++ b/.github/workflows/pull-android.yml @@ -1,46 +1,46 @@ name: Check Android on: - pull_request: - branches: ["main"] + pull_request: + branches: ["main"] permissions: - contents: write + contents: write jobs: - android-check: - runs-on: ubuntu-latest - defaults: - run: - working-directory: ./materialious/android + android-check: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./materialious/android - steps: - - uses: actions/checkout@v3 + steps: + - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: latest + - uses: actions/setup-node@v3 + with: + node-version: latest - - name: Install modules - run: cd ../ && npm install + - name: Install modules + run: cd ../ && npm install - - name: Build android nodejs packages - run: cd ../static/nodejs-android && npm install + - name: Build android nodejs packages + run: cd ../static/nodejsAndroid && npm install - - name: Build package - run: cd ../ && npm run build + - name: Build package + run: cd ../ && npm run build - - name: Sync package - run: cd ../ && npx cap sync + - name: Sync package + run: cd ../ && npx cap sync - - name: Setup JDK - uses: actions/setup-java@v3 - with: - distribution: "zulu" - java-version: "21" - cache: "gradle" + - name: Setup JDK + uses: actions/setup-java@v3 + with: + distribution: "zulu" + java-version: "21" + cache: "gradle" - - name: Build App - run: | - bash gradlew assembleRelease - bash gradlew bundleRelease + - name: Build App + run: | + bash gradlew assembleRelease + bash gradlew bundleRelease diff --git a/docs/BUILDING.md b/docs/BUILDING.md index a2d15657..129a0370 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -26,6 +26,6 @@ Materialious desktop builds are handled through GitHub using [prod-desktop.yml]( ### Android Release Android builds are handled using the workflow [prod-android.yml](../.github/workflows/prod-android.yml). -- After running the standard `npm install` and `npm run build` commands, we install the modules located in [nodejs-android/](../materialious/static/nodejs-android/) for [Capacitor-NodeJS](https://github.com/hampoelz/Capacitor-NodeJS). +- After running the standard `npm install` and `npm run build` commands, we install the modules located in [nodejsAndroid/](../materialious/static/nodejsAndroid/) for [Capacitor-NodeJS](https://github.com/hampoelz/Capacitor-NodeJS). - The `npx cap sync` command is used to synchronize with [Capacitor](https://capacitorjs.com). - The Android build is processed using [setup-java](https://github.com/actions/setup-java/tree/v3/), followed by signing the APK with [sign-android-release](https://github.com/ilharp/sign-android-release/tree/v1.0.4). diff --git a/materialious/eslint.config.js b/materialious/eslint.config.js index 72ad1f90..cd915cee 100644 --- a/materialious/eslint.config.js +++ b/materialious/eslint.config.js @@ -67,7 +67,7 @@ export default ts.config( 'package-lock.json', 'yarn.lock', // Ignore our nodejs android code - '**/nodejs-android/*', + '**/nodejsAndroid/*', // Ignore electron code from capacitorjs '**/electron/*', // Ignore build files