diff --git a/.github/release.yml b/.github/release.yml index bb9e7760..844aec8c 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -20,6 +20,9 @@ changelog: - title: Bug fix labels: - bugfix + - title: Pipeline + labels: + - pipeline - title: Other Changes labels: - "*" \ No newline at end of file diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index aecc1ffa..efe8397d 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -13,9 +13,9 @@ jobs: strategy: fail-fast: false matrix: - os: [ ARM64 ] + os: [ ubuntu-latest ] api: [ 34 ] - abi: [ arm64-v8a ] + abi: [ x86_64 ] emulatorApi: [ 14 ] tag: [ 'google_apis' ] # include: @@ -25,6 +25,17 @@ jobs: # emulatorApi: [ 9 ] # tag: 'default' steps: + - name: kvm support + run: | + egrep -c '(vmx|svm)' /proc/cpuinfo + id + sudo adduser $USER kvm + sudo chown -R $USER /dev/kvm + id + - name: prepare + run: | + sudo apt-get update && sudo apt-get install -y exiftool imagemagick xdg-utils libimage-exiftool-perl zsh jq xorg + # brew install exiftool imagemagick - uses: actions/checkout@v4 with: submodules: true @@ -71,9 +82,9 @@ jobs: emulatorApi: ${{ matrix.emulatorApi }} run: | ls -ls extendedSample/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected - set -x - cp extendedSample/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator\(AVD\)\ -\ ${{ matrix.emulatorApi }}/* screenshotsToCompare${{ matrix.emulatorApi }} - set +x + cp extendedSample/build/outputs/connected_android_test_additional_output/debugAndroidTest/connected/emulator-5554\ -\ ${{ matrix.emulatorApi }}/* screenshotsToCompare${{ matrix.emulatorApi }} + export DISPLAY=:99 + sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & ./screenShotCompare.sh - name: Archive screenshots diffs ${{ matrix.emulatorApi }} if: ${{ always() }} diff --git a/screenshotsToCompare14/ExtendedMainTest_mainSmokeTest-End.png b/screenshotsToCompare14/ExtendedMainTest_mainSmokeTest-End.png index be1a144a..0086d6c8 100644 Binary files a/screenshotsToCompare14/ExtendedMainTest_mainSmokeTest-End.png and b/screenshotsToCompare14/ExtendedMainTest_mainSmokeTest-End.png differ diff --git a/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-1AddConnect.png b/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-1AddConnect.png index 67629db6..66c22be9 100644 Binary files a/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-1AddConnect.png and b/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-1AddConnect.png differ diff --git a/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-2Subscribe.png b/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-2Subscribe.png index 6a2337fa..b6099886 100644 Binary files a/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-2Subscribe.png and b/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-2Subscribe.png differ diff --git a/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-4publish.png b/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-4publish.png index b4ba0851..90e9abfe 100644 Binary files a/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-4publish.png and b/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-4publish.png differ diff --git a/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-6End.png b/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-6End.png index 21c85005..fb4ceae7 100644 Binary files a/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-6End.png and b/screenshotsToCompare14/ExtendedPublishTest_connectAndPublish-6End.png differ diff --git a/screenshotsToCompare14/ExtendedPublishTest_disconnect-Before.png b/screenshotsToCompare14/ExtendedPublishTest_disconnect-Before.png index fc31bf16..c1387d0b 100644 Binary files a/screenshotsToCompare14/ExtendedPublishTest_disconnect-Before.png and b/screenshotsToCompare14/ExtendedPublishTest_disconnect-Before.png differ diff --git a/screenshotsToCompare14/ExtendedPublishTest_disconnect-isConnectedAgain.png b/screenshotsToCompare14/ExtendedPublishTest_disconnect-isConnectedAgain.png index fc31bf16..c1387d0b 100644 Binary files a/screenshotsToCompare14/ExtendedPublishTest_disconnect-isConnectedAgain.png and b/screenshotsToCompare14/ExtendedPublishTest_disconnect-isConnectedAgain.png differ diff --git a/screenshotsToCompare14/ExtendedPublishTest_disconnect-isDisConnected.png b/screenshotsToCompare14/ExtendedPublishTest_disconnect-isDisConnected.png index 67629db6..66c22be9 100644 Binary files a/screenshotsToCompare14/ExtendedPublishTest_disconnect-isDisConnected.png and b/screenshotsToCompare14/ExtendedPublishTest_disconnect-isDisConnected.png differ