From 1b855a7af07cf57d26db5321b94326d98cb36290 Mon Sep 17 00:00:00 2001 From: danyworks Date: Sat, 21 Sep 2024 17:13:39 -0400 Subject: [PATCH] fix --- .github/workflows/build.yml | 2 -- main.spec | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc92e60..28391f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,8 +4,6 @@ on: push: tags: - 'v*' - branches: - - main env: repo: ghcr.io/atonomic/scrapegoat diff --git a/main.spec b/main.spec index 999feea..aa46f19 100644 --- a/main.spec +++ b/main.spec @@ -15,21 +15,21 @@ architecture = 'x64' if sys.maxsize > 2**32 else 'x86' # Set the executable name and build path based on the platform and architecture if current_platform.startswith('win'): exe_name = f'scrapegoat_windows_{architecture}.exe' - build_path = 'D:\\a\\scrapegoat\\scrapegoat\\dist\\' + build_path = 'D:\\a\\scrapegoat\\scrapegoat\\build\\main\\' chrome_portable_path = './chrome_portable/chrome-win64/' chromedriver_path = './chromedriver/chromedriver-win64/' chromedriver_binary = 'chromedriver.exe' chrome_binary = 'chrome.exe' elif current_platform == 'darwin': exe_name = f'scrapegoat_macos_{architecture}' - build_path = '/Users/runner/work/scrapegoat/scrapegoat/dist/' + build_path = '/Users/runner/work/scrapegoat/scrapegoat/build/main/' chrome_portable_path = './chrome_portable/chrome-mac-x64/' chromedriver_path = './chromedriver/chromedriver-mac-x64/' chromedriver_binary = 'chromedriver' chrome_binary = 'Google Chrome.app/Contents/MacOS/Google Chrome' else: # Linux exe_name = 'scrapegoat_linux' - build_path = '/home/runner/work/scrapegoat/scrapegoat/dist/' + build_path = '/home/runner/work/scrapegoat/scrapegoat/build/main/' chrome_portable_path = './chrome_portable/chrome-linux64/' chromedriver_path = './chromedriver/chromedriver-linux64/' chromedriver_binary = 'chromedriver' @@ -110,7 +110,7 @@ if not os.path.exists(build_path): os.makedirs(build_path) # Move the built files to the destination, overwriting if necessary -source_path = os.path.join('dist', 'scrapegoat') +source_path = os.path.join('build', 'main', 'scrapegoat') if os.path.exists(build_path): shutil.rmtree(build_path) shutil.move(source_path, build_path)