From e924870ad29ded20bb5f2aa93b9d9e8b8cb9805b Mon Sep 17 00:00:00 2001 From: Gamebuster Date: Wed, 4 Dec 2024 19:44:44 -0500 Subject: [PATCH 1/3] Update ValidateApproval.yaml Fix approval failing if it doesn't contain 'approve' --- .github/workflows/ValidateApproval.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ValidateApproval.yaml b/.github/workflows/ValidateApproval.yaml index 350c926..b150217 100644 --- a/.github/workflows/ValidateApproval.yaml +++ b/.github/workflows/ValidateApproval.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest if: | ( - github.event.review.state == 'approved' && + github.event.review.state == 'APPROVE' && github.event.review.user.login == 'Gamebuster19901' ) || ( @@ -28,7 +28,7 @@ jobs: id: "checking_approval" run: | DESC="null" - if [[ "${{ github.event.review.body }}" == approved* ]]; then + if [[ ${{ github.event.review.state }} == "APPROVED" || "${{ github.event.review.body }}" == approved* ]]; then DESC="${{ github.event.review.user.login }} APPROVED build for ${{ github.event.review.commit_id }}" echo $DESC echo "conclusion=success" >> "$GITHUB_ENV" From 1fd223f7ca1e886f2515155ff6bbb665657bce4c Mon Sep 17 00:00:00 2001 From: Gamebuster19901 Date: Wed, 4 Dec 2024 20:00:40 -0500 Subject: [PATCH 2/3] Fix approval --- .github/workflows/ValidateApproval.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ValidateApproval.yaml b/.github/workflows/ValidateApproval.yaml index b150217..6bed0e5 100644 --- a/.github/workflows/ValidateApproval.yaml +++ b/.github/workflows/ValidateApproval.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest if: | ( - github.event.review.state == 'APPROVE' && + github.event.review.state == 'approved' && github.event.review.user.login == 'Gamebuster19901' ) || ( @@ -28,7 +28,7 @@ jobs: id: "checking_approval" run: | DESC="null" - if [[ ${{ github.event.review.state }} == "APPROVED" || "${{ github.event.review.body }}" == approved* ]]; then + if [[ "${{ github.event.review.state }}" == "approved" || "${{ github.event.review.body }}" == approved* ]]; then DESC="${{ github.event.review.user.login }} APPROVED build for ${{ github.event.review.commit_id }}" echo $DESC echo "conclusion=success" >> "$GITHUB_ENV" From d92868f2773a2e76a80e18b9b325a00d177a69a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 01:08:33 +0000 Subject: [PATCH 3/3] Bump log4j_version from 2.23.1 to 2.24.2 Bumps `log4j_version` from 2.23.1 to 2.24.2. Updates `org.apache.logging.log4j:log4j-core` from 2.23.1 to 2.24.2 Updates `org.apache.logging.log4j:log4j-api` from 2.23.1 to 2.24.2 Updates `org.apache.logging.log4j:log4j-slf4j2-impl` from 2.23.1 to 2.24.2 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j2-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3722c41..d870322 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ commons_lang_version = "3.14.0" commons_text_version = "1.12.0" commons_io_version = "2.16.1" fabric_loom_version = "1.7.2" -log4j_version = "2.23.1" +log4j_version = "2.24.2" provider_version = "1.5.0.3" vineflower_version = "1.10.1"