From 26ad94e71a9476be4b0cec803ecde4bd722f7928 Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Thu, 16 May 2024 14:00:56 -0700 Subject: [PATCH 1/6] Get ready to publish cronet_http 1.2.1 --- pkgs/cronet_http/CHANGELOG.md | 2 +- pkgs/cronet_http/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/cronet_http/CHANGELOG.md b/pkgs/cronet_http/CHANGELOG.md index a7dac11f08..188b3cd17e 100644 --- a/pkgs/cronet_http/CHANGELOG.md +++ b/pkgs/cronet_http/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.2.1-wip +## 1.2.1 * Upgrade `package:jni` to 0.9.2 to fix the build error in the latest versions of Flutter. diff --git a/pkgs/cronet_http/pubspec.yaml b/pkgs/cronet_http/pubspec.yaml index 261f1fb6d6..2e869381f9 100644 --- a/pkgs/cronet_http/pubspec.yaml +++ b/pkgs/cronet_http/pubspec.yaml @@ -1,5 +1,5 @@ name: cronet_http -version: 1.2.1-wip +version: 1.2.1 description: >- An Android Flutter plugin that provides access to the Cronet HTTP client. repository: https://github.com/dart-lang/http/tree/master/pkgs/cronet_http From 4bdaacaa897ae8d3997baeba70089a3b45ba5ee0 Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Thu, 16 May 2024 14:43:32 -0700 Subject: [PATCH 2/6] Update cronet.yml --- .github/workflows/cronet.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml index 40b51469be..892a644991 100644 --- a/.github/workflows/cronet.yml +++ b/.github/workflows/cronet.yml @@ -58,5 +58,7 @@ jobs: # - pkgs/cronet_http/example/android/app/build.gradle api-level: 21 arch: x86_64 + ram-size: 1024M + disk-size: 2048M target: ${{ matrix.cronetHttpNoPlay == 'true' && 'default' || 'google_apis' }} script: cd pkgs/cronet_http/example && flutter test --dart-define=cronetHttpNoPlay=${{ matrix.cronetHttpNoPlay }} --timeout=1200s integration_test/ From 1cdf8a0aa07d0eeb0d0673d2033ac9a671b367af Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Thu, 16 May 2024 15:01:22 -0700 Subject: [PATCH 3/6] Update cronet.yml --- .github/workflows/cronet.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml index 892a644991..8788eacc31 100644 --- a/.github/workflows/cronet.yml +++ b/.github/workflows/cronet.yml @@ -31,6 +31,22 @@ jobs: run: working-directory: pkgs/cronet_http steps: + - name: Delete unnecessary tools 🔧 + uses: jlumbroso/free-disk-space@v1.3.1 + with: + android: false # Don't remove Android tools + tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY" + dotnet: true # rm -rf /usr/share/dotnet + haskell: true # rm -rf /opt/ghc... + swap-storage: true # rm -f /mnt/swapfile (4GiB) + docker-images: false # Takes 16s, enable if needed in the future + large-packages: false # includes google-cloud-sdk and it's slow + - 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 + ls /dev/kvm - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: @@ -58,7 +74,8 @@ jobs: # - pkgs/cronet_http/example/android/app/build.gradle api-level: 21 arch: x86_64 - ram-size: 1024M - disk-size: 2048M + disable-animations: true + disk-size: 6000M + heap-size: 600M target: ${{ matrix.cronetHttpNoPlay == 'true' && 'default' || 'google_apis' }} script: cd pkgs/cronet_http/example && flutter test --dart-define=cronetHttpNoPlay=${{ matrix.cronetHttpNoPlay }} --timeout=1200s integration_test/ From 0f1f00b543dee70ee55093aadc8dbe0d25faf885 Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Thu, 16 May 2024 15:16:55 -0700 Subject: [PATCH 4/6] Update cronet.yml --- .github/workflows/cronet.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml index 8788eacc31..28fc50a2bd 100644 --- a/.github/workflows/cronet.yml +++ b/.github/workflows/cronet.yml @@ -41,12 +41,12 @@ jobs: swap-storage: true # rm -f /mnt/swapfile (4GiB) docker-images: false # Takes 16s, enable if needed in the future large-packages: false # includes google-cloud-sdk and it's slow - - 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 - ls /dev/kvm + # - 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 + # ls /dev/kvm - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: From 35a0d00f4b95b66518b6157bc728d0f5af960ef1 Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Thu, 16 May 2024 15:27:44 -0700 Subject: [PATCH 5/6] Update cronet.yml --- .github/workflows/cronet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml index 28fc50a2bd..938b5269cf 100644 --- a/.github/workflows/cronet.yml +++ b/.github/workflows/cronet.yml @@ -72,7 +72,7 @@ jobs: # - .github/workflows/cronet.yml # - pkgs/cronet_http/android/build.gradle # - pkgs/cronet_http/example/android/app/build.gradle - api-level: 21 + api-level: 31 arch: x86_64 disable-animations: true disk-size: 6000M From d4aeb7df4ee3ac0f194a3c2cce6b75c97bc4776b Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Thu, 16 May 2024 15:34:24 -0700 Subject: [PATCH 6/6] Update cronet.yml --- .github/workflows/cronet.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml index 938b5269cf..40b51469be 100644 --- a/.github/workflows/cronet.yml +++ b/.github/workflows/cronet.yml @@ -31,22 +31,6 @@ jobs: run: working-directory: pkgs/cronet_http steps: - - name: Delete unnecessary tools 🔧 - uses: jlumbroso/free-disk-space@v1.3.1 - with: - android: false # Don't remove Android tools - tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY" - dotnet: true # rm -rf /usr/share/dotnet - haskell: true # rm -rf /opt/ghc... - swap-storage: true # rm -f /mnt/swapfile (4GiB) - docker-images: false # Takes 16s, enable if needed in the future - large-packages: false # includes google-cloud-sdk and it's slow - # - 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 - # ls /dev/kvm - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 with: @@ -72,10 +56,7 @@ jobs: # - .github/workflows/cronet.yml # - pkgs/cronet_http/android/build.gradle # - pkgs/cronet_http/example/android/app/build.gradle - api-level: 31 + api-level: 21 arch: x86_64 - disable-animations: true - disk-size: 6000M - heap-size: 600M target: ${{ matrix.cronetHttpNoPlay == 'true' && 'default' || 'google_apis' }} script: cd pkgs/cronet_http/example && flutter test --dart-define=cronetHttpNoPlay=${{ matrix.cronetHttpNoPlay }} --timeout=1200s integration_test/