From 0540cf11fda504aa85661f41c26452228879d93e Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Sun, 20 Nov 2022 10:59:39 -0500 Subject: [PATCH] Rename CI jobs + Test linting CI will fail --- .github/workflows/{build-test.yml => all-builds.yml} | 2 +- .github/workflows/{clang-tidy-format.yml => linting.yml} | 2 +- src/texture.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) rename .github/workflows/{build-test.yml => all-builds.yml} (99%) rename .github/workflows/{clang-tidy-format.yml => linting.yml} (98%) diff --git a/.github/workflows/build-test.yml b/.github/workflows/all-builds.yml similarity index 99% rename from .github/workflows/build-test.yml rename to .github/workflows/all-builds.yml index 2589159..86c5e7a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/all-builds.yml @@ -1,4 +1,4 @@ -name: Build Test +name: All Builds on: push: diff --git a/.github/workflows/clang-tidy-format.yml b/.github/workflows/linting.yml similarity index 98% rename from .github/workflows/clang-tidy-format.yml rename to .github/workflows/linting.yml index bc7e974..0f445a4 100644 --- a/.github/workflows/clang-tidy-format.yml +++ b/.github/workflows/linting.yml @@ -1,4 +1,4 @@ -name: Clang Tidy Format +name: Linting on: push: diff --git a/src/texture.cpp b/src/texture.cpp index ac05a26..21868e5 100644 --- a/src/texture.cpp +++ b/src/texture.cpp @@ -72,9 +72,8 @@ QOpenGLTexture * OpenGLTextureFactory::initCubeMap( int i = 0; for(const auto & face : faces) { QImage faceImage(faceTextures[i]); - if(faceImage.isNull()) { + if(faceImage.isNull()) qDebug() << "Error loading cube map image\n"; - } faceImage = faceImage.convertToFormat(QImage::Format_RGBA8888); // On the first iteration, set format and allocate texture storage