From e81eb2097b366d0200f89722e80ef3f4aafeade3 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Thu, 31 Aug 2023 07:32:07 +0200 Subject: [PATCH] :wrench: Stop testing on rawhide for pre 45 version --- .github/workflows/checks.yml | 83 ++++++++++++++++++------------------ Makefile | 4 +- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 28c0a41..98267e9 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -6,10 +6,10 @@ name: Checks on: push: branches: - - '**' + - "**" pull_request: branches: - - '**' + - "**" jobs: clang_format: @@ -33,9 +33,9 @@ jobs: name: Check Compliance with REUSE Specification runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: REUSE Compliance Check - uses: fsfe/reuse-action@v1 + - uses: actions/checkout@v3 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v1 comment_percentage: name: Check Comment Percentage @@ -85,19 +85,19 @@ jobs: if: > github.event_name == 'push' && contains(github.event.head_commit.message, '[generate-references]') steps: - - uses: actions/checkout@v3 - - name: Download Dependencies - run: | - sudo apt update -qq - sudo apt install gettext imagemagick -qq - - name: Build Burn-My-Windows - run: make - - name: Generate References - run: sudo make references - - uses: actions/upload-artifact@v3 - with: - name: references - path: tests/references/ + - uses: actions/checkout@v3 + - name: Download Dependencies + run: | + sudo apt update -qq + sudo apt install gettext imagemagick -qq + - name: Build Burn-My-Windows + run: make + - name: Generate References + run: sudo make references + - uses: actions/upload-artifact@v3 + with: + name: references + path: tests/references/ build: name: Run Tests @@ -110,29 +110,28 @@ jobs: fail-fast: false matrix: version: - - '32' - - '33' - - '34' - - '35' - - '36' - - '37' - - '38' - - 'rawhide' + - "32" + - "33" + - "34" + - "35" + - "36" + - "37" + - "38" session: - - 'gnome-xsession' - - 'gnome-wayland-nested' + - "gnome-xsession" + - "gnome-wayland-nested" steps: - - uses: actions/checkout@v3 - - name: Download Dependencies - run: | - sudo apt update -qq - sudo apt install gettext imagemagick -qq - - name: Build Burn-My-Windows - run: make - - name: Test Burn-My-Windows - run: sudo $GITHUB_WORKSPACE/tests/run-test.sh -v ${{ matrix.version }} -s ${{ matrix.session }} - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: result_${{ matrix.version }}_${{ matrix.session }} - path: tests/output/ \ No newline at end of file + - uses: actions/checkout@v3 + - name: Download Dependencies + run: | + sudo apt update -qq + sudo apt install gettext imagemagick -qq + - name: Build Burn-My-Windows + run: make + - name: Test Burn-My-Windows + run: sudo $GITHUB_WORKSPACE/tests/run-test.sh -v ${{ matrix.version }} -s ${{ matrix.session }} + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: result_${{ matrix.version }}_${{ matrix.session }} + path: tests/output/ diff --git a/Makefile b/Makefile index 7f0337c..180af17 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ pot: $(JS_FILES) $(UI_FILES) # This runs several tests in containerized versions of GNOME Shell. test: - @ for version in 32 33 34 35 36 37 38 "rawhide" ; do \ + @ for version in 32 33 34 35 36 37 38 ; do \ for session in "gnome-xsession" "gnome-wayland-nested" ; do \ echo ; \ echo "Running Tests on Fedora $$version ($$session)." ; \ @@ -59,7 +59,7 @@ test: # This re-generates all reference images required by the tests. references: - @ for version in 32 33 34 35 36 37 38 "rawhide" ; do \ + @ for version in 32 33 34 35 36 37 38 ; do \ for session in "gnome-xsession" "gnome-wayland-nested" ; do \ echo ; \ echo "Generating References for Fedora $$version ($$session)." ; \