Skip to content

Commit

Permalink
Update to 1.21.2
Browse files Browse the repository at this point in the history
Revert updating the branch version to 1.21.2, since we're using overlays
  • Loading branch information
misode committed Oct 22, 2024
1 parent e865ab4 commit fd5c3ec
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
VERSION: '1.21.2'
VERSION: '1.21'
COMMIT_MSG: ${{ github.event.head_commit.message }}

jobs:
Expand Down
4 changes: 2 additions & 2 deletions gm4/plugins/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def create(ctx: Context):
ctx.cache["gm4_manifest"].json = manifest.dict()

# Read in the previous manifest, if found
version = os.getenv("VERSION", "1.21.2")
version = os.getenv("VERSION", "1.21")
release_dir = Path('release') / version
manifest_file = release_dir / "meta.json"

Expand Down Expand Up @@ -219,7 +219,7 @@ def update_patch(ctx: Context):

def write_meta(ctx: Context):
"""Write the updated meta.json file."""
version = os.getenv("VERSION", "1.21.2")
version = os.getenv("VERSION", "1.21")
release_dir = Path('release') / version
os.makedirs(release_dir, exist_ok=True)

Expand Down
12 changes: 6 additions & 6 deletions gm4/plugins/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
def beet_default(ctx: Context):
"""Saves the datapack to the ./out folder in it's exit phase.
Should be first in pipeline to properly wrap all other plugins cleanup phases"""
version = os.getenv("VERSION", "1.21.2")
version = os.getenv("VERSION", "1.21")
out_dir = Path("out")

yield # wait for exit phase, after other plugins cleanup
Expand All @@ -33,7 +33,7 @@ def beet_default(ctx: Context):

def resource_pack(ctx: Context):
"""Saves the resourcepack to the ./out folder."""
version = os.getenv("VERSION", "1.21.2")
version = os.getenv("VERSION", "1.21")
out_dir = Path("out")

ctx.assets.save(
Expand All @@ -43,7 +43,7 @@ def resource_pack(ctx: Context):

def release_resource_pack(ctx: Context):
"""Saves the resourcepack to the ./out folder."""
version = os.getenv("VERSION", "1.21.2")
version = os.getenv("VERSION", "1.21")
release_dir = Path("release") / version

yield
Expand Down Expand Up @@ -82,7 +82,7 @@ def release(ctx: Context):
`BEET_SMITHED_TOKEN` environment variable is set, will try to publish a
new version to Smithed if it doesn't already exist.
"""
version_dir = os.getenv("VERSION", "1.21.2")
version_dir = os.getenv("VERSION", "1.21")
release_dir = Path("release") / version_dir

corrected_project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id
Expand Down Expand Up @@ -199,7 +199,7 @@ def publish_smithed(ctx: Context, config: ManifestConfig, file_name: str):
"""Attempts to publish pack to smithed"""
auth_token = os.getenv(SMITHED_AUTH_KEY, None)
logger = parent_logger.getChild(f"smithed.{ctx.project_id}")
mc_version_dir = os.getenv("VERSION", "1.21.2")
mc_version_dir = os.getenv("VERSION", "1.21")
manifest = ManifestCacheModel.parse_obj(ctx.cache["gm4_manifest"].json)
project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id

Expand Down Expand Up @@ -299,7 +299,7 @@ def clear_release(ctx: Context):
1. Deleted modules no longer stick around in the current version
2. Changes to the build system (such as renamed files/folders) are properly reflected
"""
version = os.getenv("VERSION", "1.21.2")
version = os.getenv("VERSION", "1.21")
release_dir = Path("release") / version
shutil.rmtree(release_dir, ignore_errors=True)
os.makedirs(release_dir, exist_ok=True)
Expand Down

0 comments on commit fd5c3ec

Please sign in to comment.