From 75947b172bc8b60fb1f8ecdc20dca62a077156a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz?= Date: Thu, 8 Aug 2024 11:56:00 +0200 Subject: [PATCH 1/4] ci: prune expected runs --- .github/workflows/spread.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/spread.yml b/.github/workflows/spread.yml index 24c516f41b0..b59cdf5a61c 100644 --- a/.github/workflows/spread.yml +++ b/.github/workflows/spread.yml @@ -36,22 +36,10 @@ jobs: "lxd:ubuntu-22.04:spread/build/ubuntu:tsan_clang"' fi - TASKS+='"lxd:alpine-3.18:spread/build/alpine:amd64" - "lxd:alpine-3.19:spread/build/alpine:amd64" - "lxd:alpine-edge:spread/build/alpine:amd64" - "lxd:ubuntu-22.04:spread/build/sbuild:debian_sid" - "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu" - "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_mantic" + TASKS+='"lxd:ubuntu-22.04:spread/build/sbuild:ubuntu" "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_arm64" "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_armhf" - "lxd:ubuntu-22.04:spread/build/ubuntu:clang" - "lxd:fedora-38:spread/build/fedora:amd64" - "lxd:fedora-39:spread/build/fedora:amd64" - "lxd:fedora-rawhide:spread/build/fedora:amd64" - "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_devel" - "lxd:ubuntu-22.04:spread/build/sbuild:ubuntu_proposed" - "lxd:ubuntu-22.04:spread/build/ubuntu:ubsan" - "lxd:ubuntu-22.04:spread/build/ubuntu:ubsan_clang"' + "lxd:ubuntu-22.04:spread/build/ubuntu:clang"' echo ${TASKS:-} | jq -cs '{ "spread-task": . }' | awk '{ print "matrix=" $0 }' >> $GITHUB_OUTPUT From 79dbc146fd1aab02d3dcba7aff61fd260d2c5342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz?= Date: Thu, 8 Aug 2024 12:17:08 +0200 Subject: [PATCH 2/4] ci: drop coverage --- .github/workflows/coverage.yml | 112 --------------------------------- 1 file changed, 112 deletions(-) delete mode 100644 .github/workflows/coverage.yml diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml deleted file mode 100644 index 1ed0edd3599..00000000000 --- a/.github/workflows/coverage.yml +++ /dev/null @@ -1,112 +0,0 @@ -name: Coverage - -on: - push: - branches: - - main - pull_request: - types: [opened, synchronize, reopened, ready_for_review] - -concurrency: - group: ${{ github.workflow }}-${{ github.event.number && format('pr{0}', github.event.number) || github.ref_name }} - cancel-in-progress: true - -jobs: - Run: - runs-on: ubuntu-latest - - env: - CCACHE_DIR: "/tmp/ccache" - - timeout-minutes: 60 - steps: - - name: Check out code - uses: actions/checkout@v3 - with: - # So we can determine the merge base - fetch-depth: 0 - - - name: Set up CCache - id: setup-ccache - run: | - sudo apt-get install ccache - mkdir --parents ${CCACHE_DIR} - - # Find the merge base to avoid populating the cache with short lived cache entries - # and evicting those we care for - from `main` - echo "merge-base=$( git merge-base origin/main ${{ github.sha }} )" >> $GITHUB_OUTPUT - - - name: CCache - uses: actions/cache@v3 - with: - key: ccache-coverage-${{ steps.setup-ccache.outputs.merge-base }} - # if exact match isn't found, use the most recent entry for the task - restore-keys: | - ccache-coverage- - path: ${{ env.CCACHE_DIR }} - - - name: Ensure ccache size - run: | - # a full build yielded 180M cache - echo "max_size = 250" > ${CCACHE_DIR}/ccache.conf - - - name: Install dependencies - run: | - sudo apt-add-repository --yes ppa:mir-team/dev - sudo apt-get install --no-install-recommends \ - dmz-cursor-theme \ - glmark2-es2 \ - glmark2-es2-wayland \ - lcov \ - mesa-utils \ - ninja-build \ - xwayland - - # deal with incompataibles preinstalled - sudo apt-get remove --yes \ - libunwind-14-dev \ - libunwind-dev \ - libunwind-14 - - sudo apt-get build-dep ./ - - - name: Configure - run: > - cmake - -DCMAKE_BUILD_TYPE=Coverage - -DMIR_RUN_PERFORMANCE_TESTS=ON - -DCMAKE_C_COMPILER_LAUNCHER=ccache - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - -GNinja - -B build - ${{ github.workspace }} - - - name: Build - run: cmake --build build - - - name: Clear CCache stats - run: ccache --show-stats --zero-stats - - - name: Test - timeout-minutes: 10 - env: - CTEST_OUTPUT_ON_FAILURE: 1 - XDG_RUNTIME_DIR: /tmp - run: cmake --build build --target test - - - name: Measure coverage - timeout-minutes: 10 - run: cmake --build build --target coverage - - - name: Send coverage report - uses: codecov/codecov-action@v3 - with: - directory: build - fail_ci_if_error: true - verbose: true - - - if: ${{ failure() && runner.debug }} - name: Setup upterm session - uses: lhotari/action-upterm@v1 - with: - limit-access-to-actor: true From 61c419d4c8a8a6ecaba33dd1911b29af28dd48f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz?= Date: Thu, 8 Aug 2024 12:17:55 +0200 Subject: [PATCH 3/4] ci: fix downstream snap branches --- .github/workflows/snap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml index 39aa1666cbf..9c3e51a7889 100644 --- a/.github/workflows/snap.yml +++ b/.github/workflows/snap.yml @@ -87,7 +87,7 @@ jobs: uses: actions/checkout@v3 with: repository: ${{ matrix.snap }} - ref: mir-libs-build + ref: 22/mir-libs-build fetch-depth: 0 # needed for version determination - name: Tweak the stage snap From ca14460640c4b6b85b2a7eb61de8e94861b7584c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz?= Date: Thu, 8 Aug 2024 12:28:11 +0200 Subject: [PATCH 4/4] ci: drop confined-shell and Miriway We're not maintaining those for 22/ --- .github/workflows/snap.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml index 9c3e51a7889..1f2e53b4cd2 100644 --- a/.github/workflows/snap.yml +++ b/.github/workflows/snap.yml @@ -66,21 +66,13 @@ jobs: matrix: snap: - MirServer/mir-test-tools - - MirServer/confined-shell-wip - MirServer/ubuntu-frame - - Miriway/Miriway architecture: ${{ fromJSON(needs.arches.outputs.arches) }} include: - snap: MirServer/mir-test-tools track: 22 - - snap: MirServer/confined-shell-wip - track: latest - snap: MirServer/ubuntu-frame track: 22 - - snap: Miriway/Miriway - track: latest - review-opts: --allow-classic - snapcraft-channel: edge steps: - name: Check out code