From ec3234ea2195bcac57278b190b588f919a1d3b45 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Mon, 23 Jan 2023 20:18:48 +0100
Subject: [PATCH] editorconfig: trim trailing spaces from yml's
---
.editorconfig | 1 +
.github/workflows/ps2.yml | 4 ++--
.github/workflows/psp.yml | 2 +-
.github/workflows/vita.yml | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index f3d1d1e8a67e..8e66576fc806 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,6 +13,7 @@ trim_trailing_whitespace = true
[*.{html,js,json,m4,yml,yaml,vcxproj,vcxproj.filters}]
indent_size = 2
indent_style = space
+trim_tailing_whitespace = true
[*.xml]
indent_size = 4
diff --git a/.github/workflows/ps2.yml b/.github/workflows/ps2.yml
index 29b4c9e7cedf..18a5ad724843 100644
--- a/.github/workflows/ps2.yml
+++ b/.github/workflows/ps2.yml
@@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3
- name: Setup dependencies
run: |
- apk update
+ apk update
apk add cmake gmp mpc1 mpfr4 ninja pkgconf make git
# To be removed once ps2_drivers is part of PS2DEV
@@ -57,7 +57,7 @@ jobs:
export LDFLAGS="-L$PS2DEV/ps2sdk/ee/lib -L$PS2DEV/gsKit/lib -L$PS2DEV/ps2sdk/ports/lib"
export PKG_CONFIG_PATH=${{ env.SDL3_DIR }}/lib/pkgconfig
cmake/test/test_pkgconfig.sh
-
+
- name: Get short SHA
id: slug
run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
diff --git a/.github/workflows/psp.yml b/.github/workflows/psp.yml
index 073ed0db0adf..2ba9642ad2e9 100644
--- a/.github/workflows/psp.yml
+++ b/.github/workflows/psp.yml
@@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3
- name: Setup dependencies
run: |
- apk update
+ apk update
apk add cmake gmp mpc1 mpfr4 make pkgconf
- name: Configure CMake
run: |
diff --git a/.github/workflows/vita.yml b/.github/workflows/vita.yml
index fd0f306fb4fc..068efe6e9322 100644
--- a/.github/workflows/vita.yml
+++ b/.github/workflows/vita.yml
@@ -13,13 +13,13 @@ defaults:
jobs:
vita:
runs-on: ubuntu-latest
- container:
+ container:
image: vitasdk/vitasdk:latest
steps:
- uses: actions/checkout@v3
- name: Install build requirements
run: |
- apk update
+ apk update
apk add cmake ninja pkgconf bash
- name: Configure CMake
run: |