From f269e12a242986fa4dfd4dc6763e5fa8d759939b Mon Sep 17 00:00:00 2001 From: Erisu Date: Mon, 13 May 2024 23:37:53 +0900 Subject: [PATCH 1/3] ci: update gh-action's workflow --- .github/workflows/android.yml | 30 ++++++++++++++++++------------ .github/workflows/chrome.yml | 6 +++--- .github/workflows/ios.yml | 8 ++++---- .github/workflows/lint.yml | 6 +++--- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1f914ca5..f0c0bb0a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,7 +32,7 @@ on: jobs: test: name: Android ${{ matrix.versions.android }} Test - runs-on: macos-latest + runs-on: ubuntu-latest continue-on-error: true # hoist configurations to top that are expected to be updated @@ -40,7 +40,7 @@ jobs: # Storing a copy of the repo repo: ${{ github.event.pull_request.head.repo.full_name || github.repository }} - node-version: 16 + node-version: 20 # These are the default Java configurations used by most tests. # To customize these options, add "java-distro" or "java-version" to the strategy matrix with its overriding value. @@ -57,8 +57,8 @@ jobs: matrix: versions: # Test the lowest minimum supported APIs - - android: 5.1 - android-api: 22 + - android: 7 + android-api: 24 # Test the last 3-4 supported APIs - android: 10 @@ -67,20 +67,20 @@ jobs: - android: 11 android-api: 30 - - android: 12 - android-api: 31 - - android: 12L android-api: 32 + - android: 13 + android-api: 33 + timeout-minutes: 60 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: ${{ env.node-version }} - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 env: java-version: ${{ matrix.versions.java-version == '' && env.default_java-version || matrix.versions.java-version }} java-distro: ${{ matrix.versions.java-distro == '' && env.default_java-distro || matrix.versions.java-distro }} @@ -88,6 +88,12 @@ jobs: distribution: ${{ env.java-distro }} java-version: ${{ env.java-version }} + - name: Enable KVM group perms + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + - name: Run Environment Information run: | node --version @@ -105,7 +111,7 @@ jobs: if: ${{ endswith(env.repo, '/cordova-paramedic') != true }} run: npm i -g github:apache/cordova-paramedic - - uses: reactivecircus/android-emulator-runner@5de26e4bd23bf523e8a4b7f077df8bfb8e52b50e + - uses: reactivecircus/android-emulator-runner@v2 env: system-image-arch: ${{ matrix.versions.system-image-arch == '' && env.default_system-image-arch || matrix.versions.system-image-arch }} system-image-target: ${{ matrix.versions.system-image-target == '' && env.default_system-image-target || matrix.versions.system-image-target }} @@ -119,7 +125,7 @@ jobs: script: echo "Pregenerate the AVD before running Paramedic" - name: Run paramedic tests - uses: reactivecircus/android-emulator-runner@5de26e4bd23bf523e8a4b7f077df8bfb8e52b50e + uses: reactivecircus/android-emulator-runner@v2 env: system-image-arch: ${{ matrix.versions.system-image-arch == '' && env.default_system-image-arch || matrix.versions.system-image-arch }} system-image-target: ${{ matrix.versions.system-image-target == '' && env.default_system-image-target || matrix.versions.system-image-target }} diff --git a/.github/workflows/chrome.yml b/.github/workflows/chrome.yml index c44a7d3d..f9b9a8bf 100644 --- a/.github/workflows/chrome.yml +++ b/.github/workflows/chrome.yml @@ -39,11 +39,11 @@ jobs: # Storing a copy of the repo repo: ${{ github.event.pull_request.head.repo.full_name || github.repository }} - node-version: 16 + node-version: 20 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: ${{ env.node-version }} diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index f8732467..daf36dce 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -40,7 +40,7 @@ jobs: # Storing a copy of the repo repo: ${{ github.event.pull_request.head.repo.full_name || github.repository }} - node-version: 16 + node-version: 20 # > Starting April 26, 2021, all iOS and iPadOS apps submitted to the App Store must be built with Xcode 12 and the iOS 14 SDK. # Because of Apple's requirement, listed above, We will only be using the latest Xcode release for testing. @@ -63,11 +63,11 @@ jobs: xcode-version: 13.x steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: ${{ env.node-version }} - - uses: maxim-lobanov/setup-xcode@881be567d30efed8fb3f12b5099d68c3fb72aa3d + - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd env: xcode-version: ${{ matrix.versions.xcode-version == '' && env.default_xcode-version || matrix.versions.xcode-version }} with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 26716d75..53dad12f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -34,11 +34,11 @@ jobs: name: Lint Test runs-on: ubuntu-latest env: - node-version: 16 + node-version: 20 steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: ${{ env.node-version }} From e222b9b827c7cbb113e4495b3b29123731dc16df Mon Sep 17 00:00:00 2001 From: Erisu Date: Wed, 15 May 2024 14:42:38 +0900 Subject: [PATCH 2/3] ci: sync workflow with paramedic --- .github/workflows/android.yml | 19 +++++++++++++++++-- .github/workflows/chrome.yml | 2 +- .github/workflows/ios.yml | 18 +++++++++--------- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f0c0bb0a..6bbffb96 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -23,6 +23,7 @@ on: - '**.md' - 'LICENSE' - '.eslint*' + pull_request: paths-ignore: - '**.md' @@ -56,11 +57,22 @@ jobs: strategy: matrix: versions: - # Test the lowest minimum supported APIs - android: 7 android-api: 24 - # Test the last 3-4 supported APIs + - android: 7.1 + android-api: 25 + + - android: 8 + android-api: 26 + + - android: 8.1 + android-api: 27 + system-image-arch: x86 + + - android: 9 + android-api: 28 + - android: 10 android-api: 29 @@ -73,6 +85,9 @@ jobs: - android: 13 android-api: 33 + - android: 14 + android-api: 34 + timeout-minutes: 60 steps: diff --git a/.github/workflows/chrome.yml b/.github/workflows/chrome.yml index f9b9a8bf..a067f654 100644 --- a/.github/workflows/chrome.yml +++ b/.github/workflows/chrome.yml @@ -61,7 +61,7 @@ jobs: npm ci - name: Run paramedic install - if: ${{ endswith(env.repo, '/cordova-paramedic')　!= true }} + if: ${{ endswith(env.repo, '/cordova-paramedic') != true }} run: npm i -g github:apache/cordova-paramedic - name: Run paramedic tests diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index daf36dce..aa2e7ef4 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -50,18 +50,18 @@ jobs: strategy: matrix: versions: - - os-version: macos-11 - ios-version: 13.x - xcode-version: 11.x - - - os-version: macos-11 - ios-version: 14.x - xcode-version: 12.x - - - os-version: macos-11 + - os-version: macos-12 ios-version: 15.x xcode-version: 13.x + - os-version: macos-14 + ios-version: 16.x + xcode-version: 14.x + + - os-version: macos-14 + ios-version: 17.x + xcode-version: 15.x + steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 From 9079f8abc458a016f7ea2d6ea3744529cce88444 Mon Sep 17 00:00:00 2001 From: Erisu Date: Fri, 31 May 2024 23:07:13 +0900 Subject: [PATCH 3/3] ci: sync workflow with paramedic --- .github/workflows/android.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 6bbffb96..2d17c407 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -46,7 +46,7 @@ jobs: # These are the default Java configurations used by most tests. # To customize these options, add "java-distro" or "java-version" to the strategy matrix with its overriding value. default_java-distro: temurin - default_java-version: 11 + default_java-version: 17 # These are the default Android System Image configurations used by most tests. # To customize these options, add "system-image-arch" or "system-image-target" to the strategy matrix with its overriding value. @@ -79,6 +79,9 @@ jobs: - android: 11 android-api: 30 + - android: 12 + android-api: 31 + - android: 12L android-api: 32