From 1cb040a9fb25c6d1069635aac8aa1380ab85c1ca Mon Sep 17 00:00:00 2001 From: Philip Peitsch Date: Sun, 14 Jul 2024 20:23:07 +1000 Subject: [PATCH] Tune build targets - add cordova 11 with cordova-android 11 - add capacitor 5 (latest is now 6) --- .github/workflows/capacitor.yaml | 4 ++ .github/workflows/cordova.yaml | 101 +++++++++++++++++++++++++++++++ .github/workflows/cordova.yml | 96 ----------------------------- 3 files changed, 105 insertions(+), 96 deletions(-) create mode 100644 .github/workflows/cordova.yaml delete mode 100644 .github/workflows/cordova.yml diff --git a/.github/workflows/capacitor.yaml b/.github/workflows/capacitor.yaml index 7a9b0a09..3661f940 100644 --- a/.github/workflows/capacitor.yaml +++ b/.github/workflows/capacitor.yaml @@ -14,11 +14,15 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - jdk: 17 capacitor: latest node: 18.x + - jdk: 17 + capacitor: 5 + node: 18.x - jdk: 11 capacitor: 4 node: 14.x diff --git a/.github/workflows/cordova.yaml b/.github/workflows/cordova.yaml new file mode 100644 index 00000000..e0373e9a --- /dev/null +++ b/.github/workflows/cordova.yaml @@ -0,0 +1,101 @@ +name: Cordova + +on: + workflow_dispatch: + push: + branches: ['master'] + pull_request: + branches: ['master'] + +jobs: + cordova-android: + name: cordova@${{ matrix.cordova }} android@${{ matrix.platform }} + runs-on: ubuntu-${{ matrix.ubuntu }} + + strategy: + fail-fast: false + matrix: + include: + - jdk: 17 + cordova: latest + platform: latest + node: 18.x + ubuntu: 22.04 + android-cmdline-tools-version: 10406996 + - jdk: 16 + cordova: 12 + platform: 12 + node: 18.x + ubuntu: 22.04 + android-cmdline-tools-version: 9862592 + - jdk: 11 + cordova: 11 + platform: 11 + node: 14.x + ubuntu: 20.04 + android-cmdline-tools-version: 9862592 + - jdk: 11 + cordova: 11 + platform: 10 + node: 14.x + ubuntu: 20.04 + android-cmdline-tools-version: 9862592 + - jdk: 8 + cordova: 10 + platform: 10 + node: 14.x + ubuntu: 20.04 + android-cmdline-tools-version: 8512546 + + steps: + - uses: actions/checkout@v3 + - name: Setup JDK ${{ matrix.jdk }} + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.jdk }} + distribution: 'temurin' + - name: Setup Node.js ${{ matrix.node }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + with: + cmdline-tools-version: ${{ matrix.android-cmdline-tools-version }} + - name: Build test app + run: | + sdkmanager "build-tools;30.0.3" + sdkmanager "build-tools;34.0.0" + npm install -g cordova@${{ matrix.cordova }} + cordova create temp + cd temp + cordova platform add android@${{ matrix.platform }} + cordova plugin add .. --noregistry --force --link + cordova build android + + cordova-ios: + name: cordova@${{ matrix.cordova }} ios@${{ matrix.platform }} + + runs-on: macos-latest + + strategy: + matrix: + include: + - cordova: latest + platform: latest + node: 18.x + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node }} + - name: Build test app + run: | + npm install -g cordova@${{ matrix.cordova }} + cordova create temp + cd temp + cordova platform add ios@${{ matrix.platform }} + cordova plugin add .. --noregistry --force --link + cordova build ios diff --git a/.github/workflows/cordova.yml b/.github/workflows/cordova.yml deleted file mode 100644 index d5fe86b0..00000000 --- a/.github/workflows/cordova.yml +++ /dev/null @@ -1,96 +0,0 @@ -name: Cordova - -on: - workflow_dispatch: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - cordova-android: - name: android@${{ matrix.platform }} cordova@${{ matrix.cordova }} - - runs-on: ubuntu-${{ matrix.ubuntu }} - - strategy: - fail-fast: false - matrix: - include: - - jdk: 17 - cordova: latest - platform: latest - node: 18.x - ubuntu: 22.04 - android-cmdline-tools-version: 10406996 - - jdk: 16 - cordova: 12 - platform: 12 - node: 18.x - ubuntu: 22.04 - android-cmdline-tools-version: 9862592 - - jdk: 11 - cordova: 11 - platform: 10 - node: 14.x - ubuntu: 20.04 - android-cmdline-tools-version: 9862592 - - jdk: 8 - cordova: 10 - platform: 10 - node: 14.x - ubuntu: 20.04 - android-cmdline-tools-version: 8512546 - - steps: - - uses: actions/checkout@v3 - - name: Setup JDK ${{ matrix.jdk }} - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.jdk }} - distribution: 'temurin' - - name: Setup Node.js ${{ matrix.node }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - - name: Setup Android SDK - uses: android-actions/setup-android@v3 - with: - cmdline-tools-version: ${{ matrix.android-cmdline-tools-version }} - - name: Build test app - run: | - sdkmanager "build-tools;30.0.3" - sdkmanager "build-tools;34.0.0" - npm install -g cordova@${{ matrix.cordova }} - cordova create temp - cd temp - cordova platform add android@${{ matrix.platform }} - cordova plugin add .. --noregistry --force --link - cordova build android - - cordova-ios: - name: ios@${{ matrix.platform }} cordova@${{ matrix.cordova }} - - runs-on: macos-latest - - strategy: - matrix: - include: - - cordova: latest - platform: latest - node: 18.x - - steps: - - uses: actions/checkout@v3 - - name: Use Node.js ${{ matrix.node }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - - name: Build test app - run: | - npm install -g cordova@${{ matrix.cordova }} - cordova create temp - cd temp - cordova platform add ios@${{ matrix.platform }} - cordova plugin add .. --noregistry --force --link - cordova build ios