try different dir name

SilenZcience · Apr 6, 2024 · b1ddfc3 · b1ddfc3
1 parent 5f1c9f2
commit b1ddfc3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build_executable.yml b/.github/workflows/build_executable.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
     env:
-      bin: ${{ matrix.os == 'macos-latest' && './bin_/darwin/catw' || matrix.os == 'windows-latest' && './bin_/windows/catw.exe' || './bin_/linux/catw' }}
+      bin: ${{ matrix.os == 'macos-latest' && './temp/darwin/catw' || matrix.os == 'windows-latest' && './temp/windows/catw.exe' || './temp/linux/catw' }}
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -51,8 +51,8 @@ jobs:
         run: |
           git config --local user.name 'github-actions[bot]'
           git config --local user.email 'github-actions[bot]@users.noreply.github.com'
-          git add ./bin_/*
-          git stash push -m "stashed bin_" bin_
+          git add ./temp/*
+          git stash -- temp
           git clean -df
           git restore .
       - name: Fetch Binaries Branch
@@ -62,11 +62,11 @@ jobs:
           git stash pop
       - name: Copy To Bin
         run: |
-          python -c "import sys; import shutil; shutil.copytree('./bin_', './bin', dirs_exist_ok=True)"
+          python -c "import sys; import shutil; shutil.copytree('./temp', './bin', dirs_exist_ok=True)"
       - name: Commit & Push
         run: |
           git add ./bin/*
-          git reset ./bin_/*
+          git reset ./temp/*
           git status
           git commit -m "🤖Compiled Binary for ${{ matrix.os }}."
           git push origin HEAD:binaries

diff --git a/workflowHelper/build.py b/workflowHelper/build.py
@@ -65,7 +65,7 @@
 
 status = 1
 platform_name = platform.system().lower()
-command = f'pyinstaller ./cat_win/__main__.py --onefile --clean --dist ./bin_/{platform_name} --icon ./bin_/cat_icon.ico --version-file ./bin_/catwversionfile -n catw'.split(' ')
+command = f'pyinstaller ./cat_win/__main__.py --onefile --clean --dist ./temp/{platform_name} --icon ./bin_/cat_icon.ico --version-file ./temp/catwversionfile -n catw'.split(' ')
 # try pyinstaller 3 times at most...
 for _ in range(3):
     try:
@@ -80,7 +80,7 @@
 if status > 0:
     sys.exit(status)
 
-command = f'pyinstaller ./cat_win/shell.py --onefile --clean --dist ./bin_/{platform_name} --icon ./bin_/cat_icon.ico --version-file ./bin_/catsversionfile -n cats'.split(' ')
+command = f'pyinstaller ./cat_win/shell.py --onefile --clean --dist ./temp/{platform_name} --icon ./bin_/cat_icon.ico --version-file ./temp/catsversionfile -n cats'.split(' ')
 # try pyinstaller 3 times at most...
 for _ in range(3):
     try:

diff --git a/workflowHelper/exeversion.py b/workflowHelper/exeversion.py
@@ -12,9 +12,9 @@
 
 script_dir = os.path.dirname(__file__)
 root_dir = os.path.abspath(os.path.join(script_dir, os.pardir))
-CATversionFileDIR = os.path.abspath(os.path.join(root_dir, 'bin_'))
-CATWversionFile = os.path.abspath(os.path.join(root_dir, 'bin_', 'catwversionfile'))
-CATSversionFile = os.path.abspath(os.path.join(root_dir, 'bin_', 'catsversionfile'))
+CATversionFileDIR = os.path.abspath(os.path.join(root_dir, 'temp'))
+CATWversionFile = os.path.abspath(os.path.join(root_dir, 'temp', 'catwversionfile'))
+CATSversionFile = os.path.abspath(os.path.join(root_dir, 'temp', 'catsversionfile'))
 print('VersionFile Path:', CATWversionFile)
 print('VersionFile Path:', CATSversionFile)