diff --git a/.github/workflows/test_rust.yml b/.github/workflows/test_rust.yml index 600373740..34c895a5b 100644 --- a/.github/workflows/test_rust.yml +++ b/.github/workflows/test_rust.yml @@ -40,6 +40,18 @@ jobs: sudo apt-get dist-upgrade sudo apt install -y libasound2-dev libxcb-shape0-dev libxcb-xfixes0-dev mesa-vulkan-drivers + - name: Check formatting + uses: actions-rs/cargo@v1 + with: + command: fmt + args: --all -- --check + + - name: Check clippy + uses: actions-rs/cargo@v1 + with: + command: clippy + args: --all --tests -- -D warnings + - name: Run tests with image tests if: ${{ matrix.os.img_tests }} uses: actions-rs/cargo@v1 @@ -53,23 +65,9 @@ jobs: with: command: test - - name: Upload images if: ${{ failure() }} uses: actions/upload-artifact@v2 with: name: swf_images path: tests/**/*.png.updated - - - name: Check clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --all --tests -- -D warnings - - - name: Check formatting - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check - diff --git a/.github/workflows/test_web.yml b/.github/workflows/test_web.yml index c5fe01ab6..2c794dccd 100644 --- a/.github/workflows/test_web.yml +++ b/.github/workflows/test_web.yml @@ -58,10 +58,10 @@ jobs: npm run bootstrap npm run build - - name: Run tests - working-directory: web - run: npm test - - name: Check formatting working-directory: web run: npm run lint + + - name: Run tests + working-directory: web + run: npm test