From c80d5101453fa0d003dd8ae75449b634b93fca5c Mon Sep 17 00:00:00 2001 From: Justin Merrell Date: Mon, 23 Jan 2023 23:11:58 -0500 Subject: [PATCH] fix updated and ci --- .github/workflows/CD_dev-release.yml | 6 +++--- openpod/updater.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CD_dev-release.yml b/.github/workflows/CD_dev-release.yml index 8899d05..5fbc138 100644 --- a/.github/workflows/CD_dev-release.yml +++ b/.github/workflows/CD_dev-release.yml @@ -84,8 +84,8 @@ jobs: git config user.email github-actions@github.com git fetch origin - git checkout master-ci - git pull -X theirs origin master-ci + git checkout dev-release + git reset --hard origin/master-ci rm -rf LICENSE rm -rf README.md @@ -94,5 +94,5 @@ jobs: git add . - git diff-index --quiet HEAD || git commit -m "Sanitize dev-release" + git commit -m "Sanitize dev-release" git push origin dev-release --force diff --git a/openpod/updater.py b/openpod/updater.py index 5e5ddd0..c02401b 100644 --- a/openpod/updater.py +++ b/openpod/updater.py @@ -42,12 +42,12 @@ def update_pod(): # Extract the zip file. with zipfile.ZipFile(f"{latest_version['hash']}.zip", 'r') as zip_ref: - zip_ref.extractall(f"{latest_version['hash']}/") + zip_ref.extractall() # Copy the files to the root directory. os.makedirs(f"/opt/OpenPod/versions/{latest_version['hash']}/", exist_ok=True) shutil.move( - f"{latest_version['hash']}/OpenPod-{latest_version['hash']}/", + f"OpenPod-{latest_version['hash']}/OpenPod-{latest_version['hash']}/OpenPod/", f"/opt/OpenPod/versions/{latest_version['hash']}/" )