From c4b317ff03ba9b05337ac3c10b373358b170023b Mon Sep 17 00:00:00 2001 From: McCloudS <64094529+McCloudS@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:57:36 -0600 Subject: [PATCH 1/5] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8c15945..1c2c171 100755 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,6 @@ RUN apt-get update \ ENV PYTHONUNBUFFERED=1 ADD https://raw.githubusercontent.com/McCloudS/subgen/main/launcher.py /subgen/launcher.py -ADD https://raw.githubusercontent.com/McCloudS/subgen/main/subgen/subgen.py /subgen/subgen.py +ADD https://raw.githubusercontent.com/McCloudS/subgen/main/subgen.py /subgen/subgen.py CMD [ "bash", "-c", "python3 -u launcher.py" ] From a659dbf45bc12b2f67869aabef410f72053651ce Mon Sep 17 00:00:00 2001 From: McCloudS <64094529+McCloudS@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:58:11 -0600 Subject: [PATCH 2/5] Update Dockerfile.cpu --- Dockerfile.cpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.cpu b/Dockerfile.cpu index c90c5b6..c9d1151 100644 --- a/Dockerfile.cpu +++ b/Dockerfile.cpu @@ -16,6 +16,6 @@ RUN apt-get update \ ENV PYTHONUNBUFFERED=1 ADD https://raw.githubusercontent.com/McCloudS/subgen/main/launcher.py /subgen/launcher.py -ADD https://raw.githubusercontent.com/McCloudS/subgen/main/subgen/subgen.py /subgen/subgen.py +ADD https://raw.githubusercontent.com/McCloudS/subgen/main/subgen.py /subgen/subgen.py CMD [ "bash", "-c", "python3 -u launcher.py" ] From b997f2dc434b085e5873edacb6367bd411881a47 Mon Sep 17 00:00:00 2001 From: McCloudS <64094529+McCloudS@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:58:51 -0600 Subject: [PATCH 3/5] Rename github-actions-builddockerfile.yml to build_GPU --- .../workflows/{github-actions-builddockerfile.yml => build_GPU} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{github-actions-builddockerfile.yml => build_GPU} (100%) diff --git a/.github/workflows/github-actions-builddockerfile.yml b/.github/workflows/build_GPU similarity index 100% rename from .github/workflows/github-actions-builddockerfile.yml rename to .github/workflows/build_GPU From d191762023255ec7b7c65d96f2894f476c2753d1 Mon Sep 17 00:00:00 2001 From: McCloudS <64094529+McCloudS@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:59:13 -0600 Subject: [PATCH 4/5] Update calver.yml --- .github/workflows/calver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/calver.yml b/.github/workflows/calver.yml index 53fef20..fe79256 100644 --- a/.github/workflows/calver.yml +++ b/.github/workflows/calver.yml @@ -28,7 +28,7 @@ jobs: version_prefix: '' - name: Update version file run: | - sed -i "s/subgen_version =.*/subgen_version = '${{ steps.setcalver.outputs.package_version }}'/" subgen/subgen.py + sed -i "s/subgen_version =.*/subgen_version = '${{ steps.setcalver.outputs.package_version }}'/" subgen.py - name: Commit and push changes run: | From ff2857a4bc57988a9bb3481395cf24f72be3d544 Mon Sep 17 00:00:00 2001 From: McCloudS <64094529+McCloudS@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:00:47 -0600 Subject: [PATCH 5/5] Update launcher.py --- launcher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher.py b/launcher.py index 766d3f2..d2fc48b 100644 --- a/launcher.py +++ b/launcher.py @@ -55,10 +55,10 @@ def main(): if not os.path.exists(subgen_script_name): print(f"File {subgen_script_name} does not exist. Downloading from GitHub...") - download_from_github("https://raw.githubusercontent.com/McCloudS/subgen/main/subgen/subgen.py", subgen_script_name) + download_from_github("https://raw.githubusercontent.com/McCloudS/subgen/main/subgen.py", subgen_script_name) elif convert_to_bool(os.getenv("UPDATE", "False")) or args.update: print(f"File exists, but UPDATE is set to True. Downloading {subgen_script_name} from GitHub...") - download_from_github("https://raw.githubusercontent.com/McCloudS/subgen/main/subgen/subgen.py", subgen_script_name) + download_from_github("https://raw.githubusercontent.com/McCloudS/subgen/main/subgen.py", subgen_script_name) else: print("Environment variable UPDATE is not set or set to False, skipping download.")