From e7819de9c8e23351a7b435d5e435391dbede6a54 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 23 May 2024 19:56:39 -0500 Subject: [PATCH] Further config of GH Actions for OWR --- .github/workflows/release-create.yml | 12 ++++-------- Text.py | 6 +++--- build-app_version.py | 4 ++-- resources/ci/common/list_actions.py | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release-create.yml b/.github/workflows/release-create.yml index 981f1f75..5942ff1b 100644 --- a/.github/workflows/release-create.yml +++ b/.github/workflows/release-create.yml @@ -359,10 +359,6 @@ jobs: echo "Windows Asset: ${{ steps.identify-windows-asset.outputs.asset_windows }}" # create a release (MASTER) - #TODO: Make sure we updated RELEASENOTES.md - #TODO: Make sure we're firing on the proper branches - # if: contains(github.ref, 'master') # branch or tag name - # if: contains(github.event.head_commit.message, 'Version bump') # commit message - name: 📀->🚀Create a Release (MASTER) id: create_release uses: actions/create-release@v1.1.4 @@ -373,7 +369,7 @@ jobs: release_name: ${{ steps.debug_info.outputs.release_name }} body_path: RELEASENOTES.md # draft: true - if: contains(github.ref, 'master') + if: contains(github.ref, 'OverworldShuffle') && contains(github.event.head_commit.message, 'Version bump') # branch/tag name and commit message # upload linux archive asset (MASTER) #TODO: Make sure we're firing on the proper branches @@ -387,7 +383,7 @@ jobs: asset_path: ${{ steps.parentDir.outputs.parentDir }}/deploy/linux/${{ steps.identify-linux-asset.outputs.asset_linux }} asset_name: ${{ steps.debug_info.outputs.asset_prefix }}-linux-focal.tar.gz asset_content_type: application/gzip - if: contains(github.ref, 'master') + if: contains(github.ref, 'OverworldShuffle') && contains(github.event.head_commit.message, 'Version bump') # branch/tag name and commit message # upload macos archive asset (MASTER) #TODO: Make sure we're firing on the proper branches @@ -401,7 +397,7 @@ jobs: asset_path: ${{ steps.parentDir.outputs.parentDir }}/deploy/macos/${{ steps.identify-macos-asset.outputs.asset_macos }} asset_name: ${{ steps.debug_info.outputs.asset_prefix }}-osx.tar.gz asset_content_type: application/gzip - if: contains(github.ref, 'master') + if: contains(github.ref, 'OverworldShuffle') && contains(github.event.head_commit.message, 'Version bump') # branch/tag name and commit message # upload windows archive asset (MASTER) #TODO: Make sure we're firing on the proper branches @@ -415,4 +411,4 @@ jobs: asset_path: ${{ steps.parentDir.outputs.parentDir }}/deploy/windows/${{ steps.identify-windows-asset.outputs.asset_windows }} asset_name: ${{ steps.debug_info.outputs.asset_prefix }}-windows.zip asset_content_type: application/zip - if: contains(github.ref, 'master') + if: contains(github.ref, 'OverworldShuffle') && contains(github.event.head_commit.message, 'Version bump') # branch/tag name and commit message diff --git a/Text.py b/Text.py index b2753011..08756f8a 100644 --- a/Text.py +++ b/Text.py @@ -108,18 +108,18 @@ Triforce_texts = [ " Whelp…\n that just\n happened", " Oh hey…\n it's you", "\n Wheeeeee!!", - " Time for\n another one?", + " Time for\n another one?", " And\n\n scene", "\n GOT EM!!", "\n THE VALUUUE!!!", " Cool seed,\n\n right?", "\n We did it!", " Spam those\n emotes in\n wilds chat", - "\n O M G", + "\n O M G", " Hello. Will you\n you be my friend?", " Beetorp\n was\n here!", " The Wind Fish\n will wake soon.\n Hoot!", - " Meow Meow Meow\n Meow Meow Meow\n Oh my god!", + " Meow Meow Meow\n Meow Meow Meow\n Oh My God!", " Ahhhhhhhhh\n Ya ya yaaaah\n Ya ya yaaah", " .done\n\n .comment lol", " You get to\n drink from\n the firehose", diff --git a/build-app_version.py b/build-app_version.py index 6d63f3ca..69332cba 100644 --- a/build-app_version.py +++ b/build-app_version.py @@ -1,5 +1,5 @@ -from Main import __version__ as DRVersion +from OverworldShuffle import __version__ as OWVersion import os with(open(os.path.join("resources","app","meta","manifests","app_version.txt"),"w+")) as f: - f.write(DRVersion) + f.write(OWVersion) diff --git a/resources/ci/common/list_actions.py b/resources/ci/common/list_actions.py index 4aab7812..ec4caf5f 100644 --- a/resources/ci/common/list_actions.py +++ b/resources/ci/common/list_actions.py @@ -104,7 +104,7 @@ for r, d, f in os.walk(os.path.join(".", ".github")): apiRes = json.loads( apiReq.read().decode("utf-8")) except JSONDecodeError as e: - raise ValueError("🔴API Request failed: " + apiURL) + raise ValueError("API Request failed: " + apiURL) if apiRes: latest = apiRes["tag_name"] if "tag_name" in apiRes else "" if latest != "": @@ -143,7 +143,7 @@ for action, actionData in allACTIONS.items(): filename_line + " " ) - print("| 🔴Outdated |") + print("| Outdated |") print( "|" + filename_line +