From ea92b07fa8bf37f4730f6eda160c8253d808e937 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:06:34 -0400 Subject: [PATCH 001/115] Creating Executable of project --- .github/workflows/deploy.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..479fe23f --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,35 @@ +name: Deploy app and create executable + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: 'Set up Python' + uses: actions/setup-python@v3 + with: + python-version: '3.12' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install pyinstaller + + - name: Create executable + run: pyinstaller --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + + - name: Upload executable + uses: actions/upload-artifact@v3 + with: + name: my-application + path: dist/ From bf417abb8fc5525f0ad9aa74f40ca5e62946d8cb Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:23:32 -0400 Subject: [PATCH 002/115] create multiple executables --- .github/workflows/deploy.yml | 27 +++++++++++++++++++++------ {app => assets}/charticon2ICO.ico | Bin assets/charticon2ICO.png | Bin 0 -> 22392 bytes 3 files changed, 21 insertions(+), 6 deletions(-) rename {app => assets}/charticon2ICO.ico (100%) create mode 100644 assets/charticon2ICO.png diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 479fe23f..92b20033 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Deploy app and create executable +name: Deploy app and create executables on: push: @@ -10,11 +10,14 @@ on: jobs: build: - runs-on: ubuntu-latest + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - name: 'Set up Python' + - name: Set up Python uses: actions/setup-python@v3 with: python-version: '3.12' @@ -26,10 +29,22 @@ jobs: pip install pyinstaller - name: Create executable - run: pyinstaller --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + run: | + if [ $RUNNER_OS == "Linux" ]; then + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + elif [ $RUNNER_OS == "Windows" ]; then + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + elif [ $RUNNER_OS == "macOS" ]; then + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + fi - name: Upload executable uses: actions/upload-artifact@v3 with: - name: my-application - path: dist/ + name: stock-analysis-${{ matrix.os }} + path: | + dist/stock-analysis + dist/stock-analysis.exe + dist/stock-analysis.app + dist/stock-analysis.bundle + dist/stock-analysis.zip diff --git a/app/charticon2ICO.ico b/assets/charticon2ICO.ico similarity index 100% rename from app/charticon2ICO.ico rename to assets/charticon2ICO.ico diff --git a/assets/charticon2ICO.png b/assets/charticon2ICO.png new file mode 100644 index 0000000000000000000000000000000000000000..ba8abe675000dc8a7ae4977cc0271c8ab8aba812 GIT binary patch literal 22392 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 literal 0 HcmV?d00001 From cd9d36189900d6aebf44d9a23d40a57f23c4ab5a Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:29:17 -0400 Subject: [PATCH 003/115] fix deploy script --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 92b20033..f1358395 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,9 +32,9 @@ jobs: run: | if [ $RUNNER_OS == "Linux" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - elif [ $RUNNER_OS == "Windows" ]; then + if [ $RUNNER_OS == "Windows" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - elif [ $RUNNER_OS == "macOS" ]; then + if [ $RUNNER_OS == "macOS" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py fi From 70623039d82582722bb9d2aff16532cbc1a5cd82 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:32:00 -0400 Subject: [PATCH 004/115] update script to use --- .github/workflows/deploy.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f1358395..6782da5b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,6 +11,7 @@ on: jobs: build: strategy: + fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] runs-on: ${{ matrix.os }} @@ -30,13 +31,17 @@ jobs: - name: Create executable run: | - if [ $RUNNER_OS == "Linux" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - if [ $RUNNER_OS == "Windows" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - if [ $RUNNER_OS == "macOS" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - fi + case "${{ matrix.os }}" in + ubuntu-latest) + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + ;; + windows-latest) + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + ;; + macos-latest) + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + ;; + esac - name: Upload executable uses: actions/upload-artifact@v3 From 09cfcd9cd9c44c78c9df72d4620b8ae4f6c3ca71 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:38:26 -0400 Subject: [PATCH 005/115] use if's instead of case --- .github/workflows/deploy.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6782da5b..f058a616 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -31,17 +31,13 @@ jobs: - name: Create executable run: | - case "${{ matrix.os }}" in - ubuntu-latest) - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - ;; - windows-latest) - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - ;; - macos-latest) - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - ;; - esac + if [ $RUNNER_OS == "Linux" ]; then + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + if [ $RUNNER_OS == "Windows" ]; then + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + if [ $RUNNER_OS == "macOS" ]; then + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + fi - name: Upload executable uses: actions/upload-artifact@v3 From 72e8c133c495f1aee36804bb492d1ce3cfef4931 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:39:09 -0400 Subject: [PATCH 006/115] avoid building windows for now --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f058a616..4d2ef980 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,8 +33,8 @@ jobs: run: | if [ $RUNNER_OS == "Linux" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - if [ $RUNNER_OS == "Windows" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py +# if [ $RUNNER_OS == "Windows" ]; then +# pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py if [ $RUNNER_OS == "macOS" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py fi From 7649d6f1a3273b54fc3e8d46b314bcee7e9809ae Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:41:28 -0400 Subject: [PATCH 007/115] fix syntax --- .github/workflows/deploy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4d2ef980..5d79a3c5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -28,14 +28,13 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install pyinstaller - - name: Create executable run: | if [ $RUNNER_OS == "Linux" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py # if [ $RUNNER_OS == "Windows" ]; then # pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - if [ $RUNNER_OS == "macOS" ]; then + elif [ $RUNNER_OS == "macOS" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py fi From 6a07542d8dba2cad28723de2d8a6347479aeae57 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:43:13 -0400 Subject: [PATCH 008/115] fix syntax --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5d79a3c5..16d5172e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -28,6 +28,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install pyinstaller + - name: Create executable run: | if [ $RUNNER_OS == "Linux" ]; then From ee3950da05d09e8c1f3ee1198bacc3c769784c90 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:44:51 -0400 Subject: [PATCH 009/115] enable script again --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 16d5172e..6f30a9b7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,8 +33,8 @@ jobs: run: | if [ $RUNNER_OS == "Linux" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py -# if [ $RUNNER_OS == "Windows" ]; then -# pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + elif [ $RUNNER_OS == "Windows" ]; then + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py elif [ $RUNNER_OS == "macOS" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py fi From 229b2448186733316f1e2747fc48e71672c64832 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:49:45 -0400 Subject: [PATCH 010/115] remove windows build step --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6f30a9b7..63b9f7c1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -33,8 +33,8 @@ jobs: run: | if [ $RUNNER_OS == "Linux" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py - elif [ $RUNNER_OS == "Windows" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py +# elif [ $RUNNER_OS == "Windows" ]; then +# pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py elif [ $RUNNER_OS == "macOS" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py fi From 5ba3e598ecf2628f1648d310507b677790b9cf62 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 10 Jul 2024 17:53:12 -0400 Subject: [PATCH 011/115] remove windows build step --- .github/workflows/deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 63b9f7c1..d152abe0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,8 +33,6 @@ jobs: run: | if [ $RUNNER_OS == "Linux" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py -# elif [ $RUNNER_OS == "Windows" ]; then -# pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py elif [ $RUNNER_OS == "macOS" ]; then pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py fi From 23c2f9ad69f06a361fa67567ae3000e213f0cc0e Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Thu, 11 Jul 2024 20:29:52 -0400 Subject: [PATCH 012/115] move assets to assets folder --- {app => assets}/MainPage.png | Bin {app => assets}/stockx.ico | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename {app => assets}/MainPage.png (100%) rename {app => assets}/stockx.ico (100%) diff --git a/app/MainPage.png b/assets/MainPage.png similarity index 100% rename from app/MainPage.png rename to assets/MainPage.png diff --git a/app/stockx.ico b/assets/stockx.ico similarity index 100% rename from app/stockx.ico rename to assets/stockx.ico From b5ff03f5086e2e58e9525fefd700b8c1ca27cf9d Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Thu, 11 Jul 2024 21:35:02 -0400 Subject: [PATCH 013/115] fix deployment script --- .github/workflows/deploy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d152abe0..643567ed 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -28,13 +28,15 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install pyinstaller + pip install yahooquery + pip install yahooquery tkmacosx - name: Create executable run: | if [ $RUNNER_OS == "Linux" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico user_interface.py elif [ $RUNNER_OS == "macOS" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico --hidden-import=yahooquery --hidden-import=yahooquery.asyncio user_interface.py + pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico user_interface.py fi - name: Upload executable From 6e9aac17c4195c82b018c8404eef658a25a45e4d Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Thu, 11 Jul 2024 21:44:41 -0400 Subject: [PATCH 014/115] fix deployment dist path --- .github/workflows/deploy.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 643567ed..19dca91a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -44,8 +44,8 @@ jobs: with: name: stock-analysis-${{ matrix.os }} path: | - dist/stock-analysis - dist/stock-analysis.exe - dist/stock-analysis.app - dist/stock-analysis.bundle - dist/stock-analysis.zip + dist/user_interface + dist/user_interface.exe + dist/user_interface.app + dist/user_interface.bundle + dist/user_interface.zip From 2d5b5277d111a912b208b11cb3015abe08cd1857 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Thu, 11 Jul 2024 21:48:39 -0400 Subject: [PATCH 015/115] fix deployment dist path again --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 19dca91a..9b9e3738 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,7 +42,7 @@ jobs: - name: Upload executable uses: actions/upload-artifact@v3 with: - name: stock-analysis-${{ matrix.os }} + name: user_interface-${{ matrix.os }} path: | dist/user_interface dist/user_interface.exe From 183821e7f818fb01d27b0ce0eaa476448f25da27 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Thu, 11 Jul 2024 21:52:46 -0400 Subject: [PATCH 016/115] fix deployment dist path again --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9b9e3738..82542fe9 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -44,8 +44,8 @@ jobs: with: name: user_interface-${{ matrix.os }} path: | - dist/user_interface - dist/user_interface.exe - dist/user_interface.app - dist/user_interface.bundle + dist/ + dist/ + dist/ + dist/ dist/user_interface.zip From 8725336a1c64135c322fef2cf034608aaa3e7738 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Fri, 12 Jul 2024 21:08:23 -0400 Subject: [PATCH 017/115] use v4 of artifact upload --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 82542fe9..7f3ae00b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -40,7 +40,7 @@ jobs: fi - name: Upload executable - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: user_interface-${{ matrix.os }} path: | From a9040f3854eb70bc4fb44f8d5b2b6531210dd64c Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Fri, 12 Jul 2024 21:35:32 -0400 Subject: [PATCH 018/115] one file --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7f3ae00b..7a7ec042 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.12' @@ -34,9 +34,9 @@ jobs: - name: Create executable run: | if [ $RUNNER_OS == "Linux" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico user_interface.py + pyinstaller --name stock-analysis --onefile user_interface.py elif [ $RUNNER_OS == "macOS" ]; then - pyinstaller --name stock-analysis --icon=assets/charticon2ICO.ico user_interface.py + pyinstaller --name stock-analysis --onefile user_interface.py fi - name: Upload executable From e4964e5ce3ec69a07bdda44e082007d7a8eba460 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Fri, 12 Jul 2024 21:50:57 -0400 Subject: [PATCH 019/115] fix name --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7a7ec042..b2cee1b3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -34,9 +34,9 @@ jobs: - name: Create executable run: | if [ $RUNNER_OS == "Linux" ]; then - pyinstaller --name stock-analysis --onefile user_interface.py + pyinstaller --onefile --add-data "assets:assets" user_interface.py elif [ $RUNNER_OS == "macOS" ]; then - pyinstaller --name stock-analysis --onefile user_interface.py + pyinstaller --onefile --add-data "assets:assets" user_interface.py fi - name: Upload executable From a1d1be01dbc05ef36bc0c27bcca3c18912453eac Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Fri, 12 Jul 2024 21:54:03 -0400 Subject: [PATCH 020/115] fix ui --- user_interface.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/user_interface.py b/user_interface.py index 8589ee74..8af7989f 100644 --- a/user_interface.py +++ b/user_interface.py @@ -19,7 +19,15 @@ # Add the project root directory to the Python path -sys.path.append(os.path.dirname(os.path.dirname(__file__))) +if getattr(sys, 'frozen', False): + # If running as a PyInstaller bundle + # pylint: disable=protected-access + bundle_dir = sys._MEIPASS +else: + # If running in a normal Python environment + bundle_dir = os.path.abspath(os.path.dirname(__file__)) + +icon_path = os.path.join(bundle_dir, "assets/charticon2ICO.ico") class UserInterFace(tk.Tk): @@ -31,7 +39,7 @@ def __init__(self): tk.Tk.__init__(self) self.window_title = self.title("Stock Analyzer") container = tk.Frame(self) - self.icon_image = Image.open("app/charticon2ICO.ico") + self.icon_image = Image.open(icon_path) self.icon_photo = ImageTk.PhotoImage(self.icon_image) # Set the window icon From 09dc31580129f7d277939eb1d1a32ee1b4f887eb Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Fri, 12 Jul 2024 22:03:41 -0400 Subject: [PATCH 021/115] make file executable --- .github/workflows/deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b2cee1b3..6e51bdc2 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,6 +39,10 @@ jobs: pyinstaller --onefile --add-data "assets:assets" user_interface.py fi + - name: Set executable permissions + run: | + chmod +x dist/user_interface + - name: Upload executable uses: actions/upload-artifact@v4 with: From 0a0714293511aed2b2b787fb1bc5ff6f47362a61 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Fri, 12 Jul 2024 22:09:43 -0400 Subject: [PATCH 022/115] make file executable --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6e51bdc2..4e376200 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,7 +41,7 @@ jobs: - name: Set executable permissions run: | - chmod +x dist/user_interface + chmod +x user_interface - name: Upload executable uses: actions/upload-artifact@v4 From acfe4d9e01189d38e6c036557a34f6233d5afbf4 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Fri, 12 Jul 2024 22:14:48 -0400 Subject: [PATCH 023/115] cd into distrubution folder then run executable --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4e376200..43666aea 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -41,6 +41,7 @@ jobs: - name: Set executable permissions run: | + cd dist/ chmod +x user_interface - name: Upload executable From 9815de418a283f07c6cc976dc0f134e970fcbbb5 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Fri, 12 Jul 2024 22:16:32 -0400 Subject: [PATCH 024/115] cd into distrubution folder then run executable --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 43666aea..ff970ae3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -39,7 +39,7 @@ jobs: pyinstaller --onefile --add-data "assets:assets" user_interface.py fi - - name: Set executable permissions + - name: Set executable permission run: | cd dist/ chmod +x user_interface From 4746fd623d0a249016617cc7f497974038c1ee01 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 16:10:51 -0400 Subject: [PATCH 025/115] make app into dmg and .app for unix and linux --- .github/workflows/deploy.yml | 24 ++++++++++-------------- user_interface.py | 1 + 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ff970ae3..50353da4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,24 +33,20 @@ jobs: - name: Create executable run: | - if [ $RUNNER_OS == "Linux" ]; then + if [ ${{ matrix.os }} == "ubuntu-latest" ]; then pyinstaller --onefile --add-data "assets:assets" user_interface.py - elif [ $RUNNER_OS == "macOS" ]; then - pyinstaller --onefile --add-data "assets:assets" user_interface.py - fi - - - name: Set executable permission - run: | - cd dist/ - chmod +x user_interface + # Create AppImage + sudo apt-get install -y appimagekit + ./appimagetool-x86_64.AppImage dist/ user_interface.AppImage + elif [ ${{ matrix.os }} == "macos-latest" ]; then + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + # Create .dmg file + hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - name: Upload executable uses: actions/upload-artifact@v4 with: name: user_interface-${{ matrix.os }} path: | - dist/ - dist/ - dist/ - dist/ - dist/user_interface.zip + dist/user_interface.AppImage + dist/user_interface.dmg diff --git a/user_interface.py b/user_interface.py index 8af7989f..090e3b91 100644 --- a/user_interface.py +++ b/user_interface.py @@ -112,6 +112,7 @@ def on_closing(self): """ print("Cleaning up and closing the application...") self.destroy() + sys.exit(0) # Ensure the application exits if __name__ == "__main__": From 974f6f6fd9b9288247b5cf938bccbed7acb2c71e Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 16:17:27 -0400 Subject: [PATCH 026/115] remove comment --- .github/workflows/deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 50353da4..2fbe52fe 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,12 +35,10 @@ jobs: run: | if [ ${{ matrix.os }} == "ubuntu-latest" ]; then pyinstaller --onefile --add-data "assets:assets" user_interface.py - # Create AppImage sudo apt-get install -y appimagekit ./appimagetool-x86_64.AppImage dist/ user_interface.AppImage elif [ ${{ matrix.os }} == "macos-latest" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - name: Upload executable From 73f174d84d18535544df65b40458015fb2b3676e Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 16:28:48 -0400 Subject: [PATCH 027/115] fix deploy script --- .github/workflows/deploy.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2fbe52fe..a09020ff 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,10 +35,13 @@ jobs: run: | if [ ${{ matrix.os }} == "ubuntu-latest" ]; then pyinstaller --onefile --add-data "assets:assets" user_interface.py - sudo apt-get install -y appimagekit + # Create AppImage + wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage + chmod +x appimagetool-x86_64.AppImage ./appimagetool-x86_64.AppImage dist/ user_interface.AppImage elif [ ${{ matrix.os }} == "macos-latest" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - name: Upload executable From a84dd9a8d90666a37579b4911dfd13d234e3bfbe Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 16:42:03 -0400 Subject: [PATCH 028/115] fix deploy script --- .github/workflows/deploy.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a09020ff..9f32c1a7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -33,13 +33,12 @@ jobs: - name: Create executable run: | - if [ ${{ matrix.os }} == "ubuntu-latest" ]; then + if [ $RUNNER_OS == "Linux" ]; then pyinstaller --onefile --add-data "assets:assets" user_interface.py # Create AppImage - wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage - chmod +x appimagetool-x86_64.AppImage + sudo apt-get install -y appimagekit ./appimagetool-x86_64.AppImage dist/ user_interface.AppImage - elif [ ${{ matrix.os }} == "macos-latest" ]; then + elif [ $RUNNER_OS == "macOS" ];; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg From 4e20af11382b2404bbe9fd1a112f5b83748eeb85 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 16:45:04 -0400 Subject: [PATCH 029/115] removing double ; --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9f32c1a7..b609afe1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,7 +38,7 @@ jobs: # Create AppImage sudo apt-get install -y appimagekit ./appimagetool-x86_64.AppImage dist/ user_interface.AppImage - elif [ $RUNNER_OS == "macOS" ];; then + elif [ $RUNNER_OS == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg From 55a91f2d486b913282c64909531b8d45db5dd409 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 16:48:59 -0400 Subject: [PATCH 030/115] format file --- .github/workflows/deploy.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b609afe1..5f33bdd5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,28 +1,26 @@ name: Deploy app and create executables - -on: +'on': push: branches: - main pull_request: branches: - main - jobs: build: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] - runs-on: ${{ matrix.os }} + os: + - ubuntu-latest + - macos-latest + runs-on: '${{ matrix.os }}' steps: - uses: actions/checkout@v4 - - name: Set up Python uses: actions/setup-python@v5 with: python-version: '3.12' - - name: Install dependencies run: | python -m pip install --upgrade pip @@ -30,7 +28,6 @@ jobs: pip install pyinstaller pip install yahooquery pip install yahooquery tkmacosx - - name: Create executable run: | if [ $RUNNER_OS == "Linux" ]; then @@ -42,11 +39,10 @@ jobs: pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - - name: Upload executable uses: actions/upload-artifact@v4 with: - name: user_interface-${{ matrix.os }} + name: 'user_interface-${{ matrix.os }}' path: | dist/user_interface.AppImage - dist/user_interface.dmg + dist/user_interface.dmg \ No newline at end of file From 7f69399773449dc65ec12d65d6bd1f19c581b8a2 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 16:55:45 -0400 Subject: [PATCH 031/115] format file --- .github/workflows/deploy.yml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5f33bdd5..d7b37f1d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,11 +1,13 @@ name: Deploy app and create executables -'on': + +on: push: branches: - main pull_request: branches: - main + jobs: build: strategy: @@ -14,13 +16,16 @@ jobs: os: - ubuntu-latest - macos-latest - runs-on: '${{ matrix.os }}' + runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v4 + - name: Set up Python uses: actions/setup-python@v5 with: python-version: '3.12' + - name: Install dependencies run: | python -m pip install --upgrade pip @@ -28,21 +33,29 @@ jobs: pip install pyinstaller pip install yahooquery pip install yahooquery tkmacosx + - name: Create executable run: | - if [ $RUNNER_OS == "Linux" ]; then + if [ "${{ runner.os }}" == "Linux" ]; then pyinstaller --onefile --add-data "assets:assets" user_interface.py # Create AppImage sudo apt-get install -y appimagekit + wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage + chmod +x appimagetool-x86_64.AppImage ./appimagetool-x86_64.AppImage dist/ user_interface.AppImage - elif [ $RUNNER_OS == "macOS" ]; then + elif [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg + else + echo "Unsupported OS: ${{ runner.os }}" + exit 1 + fi + - name: Upload executable uses: actions/upload-artifact@v4 with: - name: 'user_interface-${{ matrix.os }}' + name: user_interface-${{ runner.os }} path: | dist/user_interface.AppImage - dist/user_interface.dmg \ No newline at end of file + dist/user_interface.dmg From 602e731b32a9f248e2754659d6fb3cc91f721966 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 17:00:47 -0400 Subject: [PATCH 032/115] fix import for wget AppImage --- .github/workflows/deploy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d7b37f1d..97b78967 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,8 +38,7 @@ jobs: run: | if [ "${{ runner.os }}" == "Linux" ]; then pyinstaller --onefile --add-data "assets:assets" user_interface.py - # Create AppImage - sudo apt-get install -y appimagekit + # Download AppImage tool wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage chmod +x appimagetool-x86_64.AppImage ./appimagetool-x86_64.AppImage dist/ user_interface.AppImage From 2e1558627727c7f5cd9145f0662c409ad6cf2936 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 17:06:43 -0400 Subject: [PATCH 033/115] only mac for now --- .github/workflows/deploy.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 97b78967..aa849382 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,7 +14,6 @@ jobs: fail-fast: false matrix: os: - - ubuntu-latest - macos-latest runs-on: ${{ matrix.os }} steps: @@ -36,12 +35,7 @@ jobs: - name: Create executable run: | - if [ "${{ runner.os }}" == "Linux" ]; then - pyinstaller --onefile --add-data "assets:assets" user_interface.py - # Download AppImage tool - wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage - chmod +x appimagetool-x86_64.AppImage - ./appimagetool-x86_64.AppImage dist/ user_interface.AppImage + elif [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py # Create .dmg file From 69d32825f288966fdcd335a01f1d6385e88060ce Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 17:08:46 -0400 Subject: [PATCH 034/115] only mac for now --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aa849382..f9af5504 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -36,7 +36,7 @@ jobs: - name: Create executable run: | - elif [ "${{ runner.os }}" == "macOS" ]; then + if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg From 6f6e0d7c6c905eee9fdc2d68905b435fdef522d6 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 17:17:28 -0400 Subject: [PATCH 035/115] fix path and name --- .github/workflows/deploy.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f9af5504..8b697184 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,7 +37,7 @@ jobs: run: | if [ "${{ runner.os }}" == "macOS" ]; then - pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + pyinstaller --onefile --name stockAnalysis --noconsole --add-data "assets:assets" user_interface.py # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg else @@ -48,7 +48,6 @@ jobs: - name: Upload executable uses: actions/upload-artifact@v4 with: - name: user_interface-${{ runner.os }} + name: stockAnalysis-${{ runner.os }} path: | - dist/user_interface.AppImage - dist/user_interface.dmg + dist/ From e37f67161a931a534f3f7d8edb2c4f28e2052a3c Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 17:21:34 -0400 Subject: [PATCH 036/115] try running windows --- .github/workflows/deploy.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b697184..4d36a7fd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,9 +37,11 @@ jobs: run: | if [ "${{ runner.os }}" == "macOS" ]; then - pyinstaller --onefile --name stockAnalysis --noconsole --add-data "assets:assets" user_interface.py + pyinstaller --onefile --name stockAnalysis --add-data "assets:assets" user_interface.py # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg + elif [ "${{ runner.os }}" == "Windows" ]; then + pyinstaller --onefile --name stockAnalysis --noconsole --add-data "assets:assets" user_interface.py else echo "Unsupported OS: ${{ runner.os }}" exit 1 @@ -50,4 +52,5 @@ jobs: with: name: stockAnalysis-${{ runner.os }} path: | - dist/ + dist/stockAnalysis + dist/stockAnalysis From d40decebab5acb707f873987e8f36c74aed8023a Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 17:26:28 -0400 Subject: [PATCH 037/115] try running windows --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4d36a7fd..11b45f1e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,6 +15,7 @@ jobs: matrix: os: - macos-latest + - windows-latest runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -39,7 +40,7 @@ jobs: if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --name stockAnalysis --add-data "assets:assets" user_interface.py # Create .dmg file - hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg + hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO stockAnalysis.dmg elif [ "${{ runner.os }}" == "Windows" ]; then pyinstaller --onefile --name stockAnalysis --noconsole --add-data "assets:assets" user_interface.py else From 6290e766ddac4985d5d65767624ee9f99dbe566e Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 17:30:14 -0400 Subject: [PATCH 038/115] try running windows + fix path --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 11b45f1e..7f6dde1a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,7 @@ jobs: matrix: os: - macos-latest - - windows-latest + - windows-latest runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -40,7 +40,7 @@ jobs: if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --name stockAnalysis --add-data "assets:assets" user_interface.py # Create .dmg file - hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO stockAnalysis.dmg + hdiutil create -volname stockAnalysis -srcfolder dist/ -ov -format UDZO stockAnalysis.dmg elif [ "${{ runner.os }}" == "Windows" ]; then pyinstaller --onefile --name stockAnalysis --noconsole --add-data "assets:assets" user_interface.py else From 1251312fedab6d4f90b27aacb0163fe00682a017 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 18:38:26 -0400 Subject: [PATCH 039/115] fix macOS --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7f6dde1a..8f63893f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,9 +38,9 @@ jobs: run: | if [ "${{ runner.os }}" == "macOS" ]; then - pyinstaller --onefile --name stockAnalysis --add-data "assets:assets" user_interface.py + pyinstaller --onefile --add-data "assets:assets" user_interface.py # Create .dmg file - hdiutil create -volname stockAnalysis -srcfolder dist/ -ov -format UDZO stockAnalysis.dmg + hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg elif [ "${{ runner.os }}" == "Windows" ]; then pyinstaller --onefile --name stockAnalysis --noconsole --add-data "assets:assets" user_interface.py else @@ -53,5 +53,5 @@ jobs: with: name: stockAnalysis-${{ runner.os }} path: | - dist/stockAnalysis - dist/stockAnalysis + dist/user_interface + dist/user_interface From 3bd10cacadb0ad778f4524ea94c76d90b29a8c98 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 18:41:43 -0400 Subject: [PATCH 040/115] fix macOS --- .github/workflows/deploy.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8f63893f..da6b727c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,7 +15,6 @@ jobs: matrix: os: - macos-latest - - windows-latest runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -38,11 +37,9 @@ jobs: run: | if [ "${{ runner.os }}" == "macOS" ]; then - pyinstaller --onefile --add-data "assets:assets" user_interface.py + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - elif [ "${{ runner.os }}" == "Windows" ]; then - pyinstaller --onefile --name stockAnalysis --noconsole --add-data "assets:assets" user_interface.py else echo "Unsupported OS: ${{ runner.os }}" exit 1 @@ -51,7 +48,7 @@ jobs: - name: Upload executable uses: actions/upload-artifact@v4 with: - name: stockAnalysis-${{ runner.os }} + name: user_interface-${{ runner.os }} path: | - dist/user_interface - dist/user_interface + dist/user_interface.AppImage + dist/user_interface.dmg \ No newline at end of file From e5084a927cc1c5cd8f74199a59dd7ae471d3a954 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 18:44:00 -0400 Subject: [PATCH 041/115] fix macOS distribution --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index da6b727c..19ab3edf 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -50,5 +50,5 @@ jobs: with: name: user_interface-${{ runner.os }} path: | - dist/user_interface.AppImage - dist/user_interface.dmg \ No newline at end of file + dist/ + dist/ \ No newline at end of file From 8f971a68cbf4557f3eb5e706caf85469e1152444 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 18:55:28 -0400 Subject: [PATCH 042/115] fix macOS distribution --- .github/workflows/deploy.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 19ab3edf..fc5f09d4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,11 +35,8 @@ jobs: - name: Create executable run: | - if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - # Create .dmg file - hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg else echo "Unsupported OS: ${{ runner.os }}" exit 1 @@ -51,4 +48,9 @@ jobs: name: user_interface-${{ runner.os }} path: | dist/ - dist/ \ No newline at end of file + + - name: Set executable permission + if: runner.os == 'macOS' + run: | + chmod +x dist/user_interface + From ec496f998046bfaf76dec2bf3694a33b218da509 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 18:58:51 -0400 Subject: [PATCH 043/115] set permissions --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fc5f09d4..5d61c794 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,7 +47,7 @@ jobs: with: name: user_interface-${{ runner.os }} path: | - dist/ + user_interface - name: Set executable permission if: runner.os == 'macOS' From 3519c2d1687b41398000103554093f722b46b05e Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 19:01:41 -0400 Subject: [PATCH 044/115] set permissions and change path --- .github/workflows/deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5d61c794..11c4ca92 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,10 +47,11 @@ jobs: with: name: user_interface-${{ runner.os }} path: | - user_interface + dist/ - name: Set executable permission if: runner.os == 'macOS' run: | - chmod +x dist/user_interface + cd dist/ + chmod +x user_interface From 25b082cbddc17d0998784414308bb8fabb6b67f6 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 19:06:16 -0400 Subject: [PATCH 045/115] set permissions and change path --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 11c4ca92..7a552b0f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,7 +47,7 @@ jobs: with: name: user_interface-${{ runner.os }} path: | - dist/ + dist/user_interface - name: Set executable permission if: runner.os == 'macOS' From 283978faa68ad0649758aba1024d35b53d10f2f7 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 19:15:13 -0400 Subject: [PATCH 046/115] mac setting permissions --- .github/workflows/deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7a552b0f..65f51431 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,6 +37,7 @@ jobs: run: | if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg else echo "Unsupported OS: ${{ runner.os }}" exit 1 From 20d90230d02227f6469532553bb3bb15eba98eb3 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 14 Jul 2024 19:21:48 -0400 Subject: [PATCH 047/115] dis --- .github/workflows/deploy.yml | 2 +- .github/workflows/linting.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 65f51431..26f3692d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -48,7 +48,7 @@ jobs: with: name: user_interface-${{ runner.os }} path: | - dist/user_interface + dist/ - name: Set executable permission if: runner.os == 'macOS' diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 949f0900..73d8c724 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: 'Set up Python ${{ matrix.python-version }}' - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.12' - name: Install dependencies From f8298074bbdfe66fd949b2fa090fec942268cf9b Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Tue, 16 Jul 2024 10:17:14 -0400 Subject: [PATCH 048/115] signing app for mac --- .github/workflows/deploy.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 26f3692d..e2bfd632 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,22 +37,21 @@ jobs: run: | if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - else + # Sign the application locally + codesign --deep --force --verbose --sign - dist/user_interface.app + else: echo "Unsupported OS: ${{ runner.os }}" exit 1 - fi - name: Upload executable uses: actions/upload-artifact@v4 with: name: user_interface-${{ runner.os }} - path: | - dist/ + path: dist/ - name: Set executable permission if: runner.os == 'macOS' - run: | - cd dist/ - chmod +x user_interface + run: chmod +x dist/user_interface.app/Contents/MacOS/* From fb2801e728ff92b5115e78817a0f52f376330c5e Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Tue, 16 Jul 2024 10:20:06 -0400 Subject: [PATCH 049/115] UNDO: signing app for mac --- .github/workflows/deploy.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e2bfd632..26f3692d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,21 +37,22 @@ jobs: run: | if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - # Create .dmg file hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - # Sign the application locally - codesign --deep --force --verbose --sign - dist/user_interface.app - else: + else echo "Unsupported OS: ${{ runner.os }}" exit 1 + fi - name: Upload executable uses: actions/upload-artifact@v4 with: name: user_interface-${{ runner.os }} - path: dist/ + path: | + dist/ - name: Set executable permission if: runner.os == 'macOS' - run: chmod +x dist/user_interface.app/Contents/MacOS/* + run: | + cd dist/ + chmod +x user_interface From 3620e533a0d3e12e27748c1733bd2eaabbd41664 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 19:57:55 -0400 Subject: [PATCH 050/115] try uploading just the .dmg --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 26f3692d..d87bf8a1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -48,7 +48,7 @@ jobs: with: name: user_interface-${{ runner.os }} path: | - dist/ + user_interface.dmg - name: Set executable permission if: runner.os == 'macOS' From 50841b7ff28554108bc5f5ebfa304700b1679278 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 20:09:43 -0400 Subject: [PATCH 051/115] enable windows and ubuntu --- .github/workflows/deploy.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d87bf8a1..c581d48e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,6 +15,8 @@ jobs: matrix: os: - macos-latest + - windows-latest + - ubuntu-latest runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -38,6 +40,10 @@ jobs: if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg + elif [ "${{ runner.os }}" == "Windows" ]; then + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + elif [ $RUNNER_OS == "Linux" ]; then + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py else echo "Unsupported OS: ${{ runner.os }}" exit 1 @@ -49,10 +55,7 @@ jobs: name: user_interface-${{ runner.os }} path: | user_interface.dmg - - - name: Set executable permission - if: runner.os == 'macOS' - run: | - cd dist/ - chmod +x user_interface - + dist/user_interface.exe + dist/user_interface.app + dist/user_interface.bundle + dist/user_interface.zip \ No newline at end of file From 16eeaae48be2c0c54fd2288ab0a3b37dde7b86dc Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 20:25:14 -0400 Subject: [PATCH 052/115] fix windows build --- .github/workflows/deploy.yml | 38 ++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c581d48e..1cff7be3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,27 +27,44 @@ jobs: with: python-version: '3.12' - - name: Install dependencies + - name: Install dependencies (Bash) + if: runner.os != 'Windows' run: | python -m pip install --upgrade pip pip install -r requirements.txt pip install pyinstaller pip install yahooquery - pip install yahooquery tkmacosx + pip install tkmacosx + shell: bash - - name: Create executable + - name: Install dependencies (PowerShell) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install pyinstaller + pip install yahooquery + pip install tkmacosx + shell: pwsh + + - name: Create executable (Bash) + if: runner.os != 'Windows' run: | if [ "${{ runner.os }}" == "macOS" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - elif [ "${{ runner.os }}" == "Windows" ]; then + elif [ "${{ runner.os }}" == "Linux" ]; then pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - elif [ $RUNNER_OS == "Linux" ]; then - pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py else echo "Unsupported OS: ${{ runner.os }}" exit 1 - fi + shell: bash + + - name: Create executable (PowerShell) + if: runner.os == 'Windows' + run: | + pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py + shell: pwsh - name: Upload executable uses: actions/upload-artifact@v4 @@ -55,7 +72,8 @@ jobs: name: user_interface-${{ runner.os }} path: | user_interface.dmg - dist/user_interface.exe dist/user_interface.app - dist/user_interface.bundle - dist/user_interface.zip \ No newline at end of file + dist/ + dist/user_interface.zip + dist/user_interface.exe + From aebe171d9e283ef15256665caa15ce0768332a74 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 20:39:25 -0400 Subject: [PATCH 053/115] make it work on mac and linux too --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1cff7be3..d229e500 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,8 +15,9 @@ jobs: matrix: os: - macos-latest - - windows-latest - ubuntu-latest + - windows-latest + runs-on: ${{ matrix.os }} steps: - name: Checkout code @@ -72,8 +73,7 @@ jobs: name: user_interface-${{ runner.os }} path: | user_interface.dmg + dist/user_interface.exe dist/user_interface.app - dist/ + dist/user_interface.bundle dist/user_interface.zip - dist/user_interface.exe - From d54f98b3a0831a92046bf002f88eac2061c02c84 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 21:05:43 -0400 Subject: [PATCH 054/115] making it work on mac and ubuntu --- .github/workflows/deploy.yml | 50 +++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d229e500..1b538b50 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -48,32 +48,42 @@ jobs: pip install tkmacosx shell: pwsh - - name: Create executable (Bash) - if: runner.os != 'Windows' + - name: Create executable (macOS) + if: matrix.os == 'macos-latest' run: | - if [ "${{ runner.os }}" == "macOS" ]; then - pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - elif [ "${{ runner.os }}" == "Linux" ]; then - pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - else - echo "Unsupported OS: ${{ runner.os }}" - exit 1 + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg shell: bash - - name: Create executable (PowerShell) - if: runner.os == 'Windows' + - name: Create executable (Linux) + if: matrix.os == 'ubuntu-latest' + run: | + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + shell: bash + + - name: Create executable (Windows) + if: matrix.os == 'windows-latest' run: | pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py shell: pwsh - - name: Upload executable + - name: Upload executable (macOS) + if: matrix.os == 'macos-latest' + uses: actions/upload-artifact@v4 + with: + name: user_interface-macOS + path: user_interface-macOS/user_interface.dmg + + - name: Upload executable (Linux) + if: matrix.os == 'ubuntu-latest' + uses: actions/upload-artifact@v4 + with: + name: user_interface-Linux + path: user_interface-Linux/dist/user_interface + + - name: Upload executable (Windows) + if: matrix.os == 'windows-latest' uses: actions/upload-artifact@v4 with: - name: user_interface-${{ runner.os }} - path: | - user_interface.dmg - dist/user_interface.exe - dist/user_interface.app - dist/user_interface.bundle - dist/user_interface.zip + name: user_interface-Windows + path: user_interface-Windows/dist/user_interface.exe From 4681bfa523d2ce2895e9047c3ea981ceebd7b748 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 21:11:03 -0400 Subject: [PATCH 055/115] it works. Now change path so executables appear --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1b538b50..c16dd6c6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -72,18 +72,18 @@ jobs: uses: actions/upload-artifact@v4 with: name: user_interface-macOS - path: user_interface-macOS/user_interface.dmg +# path: user_interface.dmg - name: Upload executable (Linux) if: matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Linux - path: user_interface-Linux/dist/user_interface + path: dist/user_interface - name: Upload executable (Windows) if: matrix.os == 'windows-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Windows - path: user_interface-Windows/dist/user_interface.exe + path: dist/user_interface.exe From d54a2520c3cbdd254b22639d0d85f25483a05830 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 21:15:44 -0400 Subject: [PATCH 056/115] fix mac --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c16dd6c6..570ca48b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -72,7 +72,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: user_interface-macOS -# path: user_interface.dmg + path: dist/user_interface.dmg - name: Upload executable (Linux) if: matrix.os == 'ubuntu-latest' From 01cc44eff55b9e2d223bcf546bf24ba27dd7c81b Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 21:20:02 -0400 Subject: [PATCH 057/115] fix mac dmg --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 570ca48b..157898a5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -72,7 +72,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: user_interface-macOS - path: dist/user_interface.dmg + path: user_interface.dmg - name: Upload executable (Linux) if: matrix.os == 'ubuntu-latest' From 03e821ecdfaf1713cdd1cc26aa2691a1c863e082 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 21:30:14 -0400 Subject: [PATCH 058/115] fix ubuntu file extension --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 157898a5..904ca821 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -79,7 +79,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: user_interface-Linux - path: dist/user_interface + path: dist/user_interface.app - name: Upload executable (Windows) if: matrix.os == 'windows-latest' From 455a5394348e8033d8e432f1cb5c7cfc698dc30b Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Wed, 17 Jul 2024 21:35:55 -0400 Subject: [PATCH 059/115] fix ubuntu file extension --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 904ca821..157898a5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -79,7 +79,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: user_interface-Linux - path: dist/user_interface.app + path: dist/user_interface - name: Upload executable (Windows) if: matrix.os == 'windows-latest' From 929f9ccee4010c8fcddda92cb1a3259ba4ed6d26 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 10:45:47 -0400 Subject: [PATCH 060/115] create a pre release --- .github/workflows/deploy.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 157898a5..ae707d32 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -87,3 +87,18 @@ jobs: with: name: user_interface-Windows path: dist/user_interface.exe + + - name: Create release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + body: | + Changes in this Release + - First Change + - Second Change + draft: true + prerelease: true \ No newline at end of file From fcf6f3fc29736030f5c73646ac8fa37c0f1c19f3 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 11:42:25 -0400 Subject: [PATCH 061/115] create artifacts and upload them to release page --- .github/workflows/deploy.yml | 69 +++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ae707d32..fb9236c6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,24 +1,19 @@ -name: Deploy app and create executables +name: Build and Release on: push: - branches: - - main - pull_request: - branches: - - main + tags: + - 'v*.*.*' jobs: build: strategy: fail-fast: false matrix: - os: - - macos-latest - - ubuntu-latest - - windows-latest + os: [macos-latest, ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} + steps: - name: Checkout code uses: actions/checkout@v4 @@ -67,28 +62,36 @@ jobs: pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py shell: pwsh - - name: Upload executable (macOS) + - name: Upload artifacts (macOS) if: matrix.os == 'macos-latest' uses: actions/upload-artifact@v4 with: name: user_interface-macOS path: user_interface.dmg - - name: Upload executable (Linux) + - name: Upload artifacts (Linux) if: matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Linux path: dist/user_interface - - name: Upload executable (Windows) + - name: Upload artifacts (Windows) if: matrix.os == 'windows-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Windows path: dist/user_interface.exe - - name: Create release + release: + needs: build + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Create GitHub Release id: create_release uses: actions/create-release@v1 env: @@ -96,9 +99,35 @@ jobs: with: tag_name: ${{ github.ref }} release_name: Release ${{ github.ref }} - body: | - Changes in this Release - - First Change - - Second Change - draft: true - prerelease: true \ No newline at end of file + draft: false + prerelease: false + + - name: Upload Release Asset (macOS) + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: path/to/your/macos/artifact/user_interface.dmg + asset_name: user_interface.dmg + asset_content_type: application/octet-stream + + - name: Upload Release Asset (Linux) + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: path/to/your/linux/artifact/user_interface + asset_name: user_interface + asset_content_type: application/octet-stream + + - name: Upload Release Asset (Windows) + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: path/to/your/windows/artifact/user_interface.exe + asset_name: user_interface.exe + asset_content_type: application/octet-stream From 7a252d7048ecc6d97bad81feb6a0ffa4a628b2ab Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 11:45:07 -0400 Subject: [PATCH 062/115] fix paths for uploads --- .github/workflows/deploy.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index fb9236c6..1c0f986a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -86,7 +86,8 @@ jobs: release: needs: build runs-on: ubuntu-latest - + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout code uses: actions/checkout@v4 @@ -94,8 +95,7 @@ jobs: - name: Create GitHub Release id: create_release uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: tag_name: ${{ github.ref }} release_name: Release ${{ github.ref }} @@ -104,30 +104,27 @@ jobs: - name: Upload Release Asset (macOS) uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: path/to/your/macos/artifact/user_interface.dmg + asset_path: user_interface.dmg asset_name: user_interface.dmg asset_content_type: application/octet-stream - name: Upload Release Asset (Linux) uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: path/to/your/linux/artifact/user_interface + asset_path: dist/user_interface asset_name: user_interface asset_content_type: application/octet-stream - name: Upload Release Asset (Windows) uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: path/to/your/windows/artifact/user_interface.exe + asset_path: dist/user_interface.exe asset_name: user_interface.exe asset_content_type: application/octet-stream From e671829b2cf3b2ba480739f999605c0a4838f268 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 11:47:01 -0400 Subject: [PATCH 063/115] temp on push to main to trigger workflow --- .github/workflows/deploy.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1c0f986a..ec0299d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,8 +2,11 @@ name: Build and Release on: push: - tags: - - 'v*.*.*' + branches: + - main + pull_request: null +# tags: +# - 'v*.*.*' jobs: build: From 9a4f78648f3516481d9d027c0765fbc0766e4e0c Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 11:53:06 -0400 Subject: [PATCH 064/115] make the create github release step succeed --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ec0299d8..68fd73ff 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -100,9 +100,9 @@ jobs: uses: actions/create-release@v1 with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false + tag_name: 'taggers' + release_name: Release test + draft: true prerelease: false - name: Upload Release Asset (macOS) From 5b3a3e2df8f94ca47c8cccdea7ae4823ef90b79a Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 12:00:20 -0400 Subject: [PATCH 065/115] fix asset path for mac --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 68fd73ff..2bac4427 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -87,6 +87,7 @@ jobs: path: dist/user_interface.exe release: + needs: build runs-on: ubuntu-latest env: @@ -110,7 +111,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: user_interface.dmg + asset_path: dist asset_name: user_interface.dmg asset_content_type: application/octet-stream From 1486cb5ae2e60a9fc2539d61b8d4d9311afde1c6 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 12:12:36 -0400 Subject: [PATCH 066/115] fix asset path for mac part 2 --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2bac4427..aaf51830 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -111,7 +111,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist + asset_path: ./ asset_name: user_interface.dmg asset_content_type: application/octet-stream From c73ab8a71f4d0652df698e6fec7076f321a1c187 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 12:23:00 -0400 Subject: [PATCH 067/115] fix asset path for mac part 3 --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aaf51830..6935ba69 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -111,8 +111,8 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./ - asset_name: user_interface.dmg + asset_path: dist/user_interface + asset_name: user_interface asset_content_type: application/octet-stream - name: Upload Release Asset (Linux) @@ -129,6 +129,6 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface.exe - asset_name: user_interface.exe + asset_path: dist/user_interface + asset_name: user_interface asset_content_type: application/octet-stream From 9585a54f0321583f23cda1460b99c57378d5c834 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 12:29:28 -0400 Subject: [PATCH 068/115] debugging where the files are listed --- .github/workflows/deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6935ba69..78ce59bb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -86,6 +86,10 @@ jobs: name: user_interface-Windows path: dist/user_interface.exe + - name: List files for debugging + run: | + echo "Listing files in dist directory:" + ls dist/ release: needs: build From d1301d93569600fff76e1519685a79b08ca19b56 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 12:52:11 -0400 Subject: [PATCH 069/115] path = asset name --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 78ce59bb..14b9fc14 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -115,7 +115,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface + asset_path: user_interface asset_name: user_interface asset_content_type: application/octet-stream @@ -124,7 +124,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface + asset_path: user_interface asset_name: user_interface asset_content_type: application/octet-stream From ee85008d68c007e2452c1dc0d7e57fe333705ba9 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 13:33:03 -0400 Subject: [PATCH 070/115] seperating the two workflows: one to create release artifacts and the other to build apps --- .github/workflows/create-apps.yml | 89 +++++++++++++++++++++++++++++++ .github/workflows/deploy.yml | 8 +-- 2 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/create-apps.yml diff --git a/.github/workflows/create-apps.yml b/.github/workflows/create-apps.yml new file mode 100644 index 00000000..4ea5cb3b --- /dev/null +++ b/.github/workflows/create-apps.yml @@ -0,0 +1,89 @@ +name: Create executables + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + build: + strategy: + fail-fast: false + matrix: + os: + - macos-latest + - ubuntu-latest + - windows-latest + + runs-on: ${{ matrix.os }} + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + + - name: Install dependencies (Bash) + if: runner.os != 'Windows' + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install pyinstaller + pip install yahooquery + pip install tkmacosx + shell: bash + + - name: Install dependencies (PowerShell) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install pyinstaller + pip install yahooquery + pip install tkmacosx + shell: pwsh + + - name: Create executable (macOS) + if: matrix.os == 'macos-latest' + run: | + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg + shell: bash + + - name: Create executable (Linux) + if: matrix.os == 'ubuntu-latest' + run: | + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + shell: bash + + - name: Create executable (Windows) + if: matrix.os == 'windows-latest' + run: | + pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py + shell: pwsh + + - name: Upload executable (macOS) + if: matrix.os == 'macos-latest' + uses: actions/upload-artifact@v4 + with: + name: user_interface-macOS + path: user_interface.dmg + + - name: Upload executable (Linux) + if: matrix.os == 'ubuntu-latest' + uses: actions/upload-artifact@v4 + with: + name: user_interface-Linux + path: dist/user_interface + + - name: Upload executable (Windows) + if: matrix.os == 'windows-latest' + uses: actions/upload-artifact@v4 + with: + name: user_interface-Windows + path: dist/user_interface.exe \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 14b9fc14..983efd6a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Build and Release +name: Create Release Artifacts on: push: @@ -70,21 +70,21 @@ jobs: uses: actions/upload-artifact@v4 with: name: user_interface-macOS - path: user_interface.dmg + path: dist/ - name: Upload artifacts (Linux) if: matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Linux - path: dist/user_interface + path: dist/ - name: Upload artifacts (Windows) if: matrix.os == 'windows-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Windows - path: dist/user_interface.exe + path: dist/ - name: List files for debugging run: | From 328f9029dc4a0a343893d573b9770725923b331a Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 13:38:11 -0400 Subject: [PATCH 071/115] fix dist folder --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 983efd6a..9e94ca5c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -115,7 +115,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: user_interface + asset_path: dist/ asset_name: user_interface asset_content_type: application/octet-stream @@ -124,7 +124,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: user_interface + asset_path: dist/ asset_name: user_interface asset_content_type: application/octet-stream From c0fab7895ce6530ca4f550b984c8b2d39dd6fdb3 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 14:04:13 -0400 Subject: [PATCH 072/115] quick debug --- .github/workflows/deploy.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9e94ca5c..7fd0c8ee 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -70,21 +70,27 @@ jobs: uses: actions/upload-artifact@v4 with: name: user_interface-macOS - path: dist/ + path: + dist/ + dist/user_interface.zip - name: Upload artifacts (Linux) if: matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Linux - path: dist/ + path: + dist/ + dist/user_interface.zip - name: Upload artifacts (Windows) if: matrix.os == 'windows-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Windows - path: dist/ + path: + dist/ + dist/user_interface.zip - name: List files for debugging run: | @@ -112,10 +118,12 @@ jobs: - name: Upload Release Asset (macOS) uses: actions/upload-release-asset@v1 - + run: | + echo "Listing files in dist directory:" + ls with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/ + asset_path: dist/user_interface.zip asset_name: user_interface asset_content_type: application/octet-stream From 8806bac5d345535863777b5db0ef997664818146 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 14:06:20 -0400 Subject: [PATCH 073/115] quick debug x2 --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7fd0c8ee..de202151 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -117,10 +117,10 @@ jobs: prerelease: false - name: Upload Release Asset (macOS) - uses: actions/upload-release-asset@v1 run: | - echo "Listing files in dist directory:" - ls + echo "Listing files in dist directory:" + ls + uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: dist/user_interface.zip From e5f24156ffd322b61fb36b013baf9b1bd90944ab Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 14:07:32 -0400 Subject: [PATCH 074/115] quick debug x3 --- .github/workflows/deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index de202151..c1cc9336 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -116,10 +116,12 @@ jobs: draft: true prerelease: false - - name: Upload Release Asset (macOS) + - name: List files for debugging run: | echo "Listing files in dist directory:" ls + + - name: Upload Release Asset (macOS) uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} From 568cb4a5d82ed584a86158c1be1182c026156571 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 14:13:55 -0400 Subject: [PATCH 075/115] quick debug x4 --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c1cc9336..207cb510 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -119,7 +119,7 @@ jobs: - name: List files for debugging run: | echo "Listing files in dist directory:" - ls + ls assets - name: Upload Release Asset (macOS) uses: actions/upload-release-asset@v1 From 8775ec4ebcfc5a4d17d680136102d09212ef70ed Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 18:22:51 -0400 Subject: [PATCH 076/115] condense the yml into one --- .github/workflows/create-apps.yml | 10 +-- .github/workflows/deploy.yml | 10 +-- .github/workflows/sample.yml | 131 ++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/sample.yml diff --git a/.github/workflows/create-apps.yml b/.github/workflows/create-apps.yml index 4ea5cb3b..a459caa2 100644 --- a/.github/workflows/create-apps.yml +++ b/.github/workflows/create-apps.yml @@ -2,11 +2,11 @@ name: Create executables on: push: - branches: - - main - pull_request: - branches: - - main +# branches: +# - main +# pull_request: null + tags: + - 'v*.*.*' jobs: build: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 207cb510..c984df8e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,11 +2,11 @@ name: Create Release Artifacts on: push: - branches: - - main - pull_request: null -# tags: -# - 'v*.*.*' +# branches: +# - main +# pull_request: null + tags: + - 'v*.*.*' jobs: build: diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml new file mode 100644 index 00000000..df6eddc4 --- /dev/null +++ b/.github/workflows/sample.yml @@ -0,0 +1,131 @@ +name: Create executables and release upload + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + build: + strategy: + fail-fast: false + matrix: + os: + - macos-latest + - ubuntu-latest + - windows-latest + + runs-on: ${{ matrix.os }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.12' + + - name: Install dependencies (Bash) + if: runner.os != 'Windows' + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install pyinstaller + pip install yahooquery + pip install tkmacosx + shell: bash + + - name: Install dependencies (PowerShell) + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install pyinstaller + pip install yahooquery + pip install tkmacosx + shell: pwsh + + - name: Create executable (macOS) + if: matrix.os == 'macos-latest' + run: | + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg + shell: bash + + - name: Create executable (Linux) + if: matrix.os == 'ubuntu-latest' + run: | + pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py + shell: bash + + - name: Create executable (Windows) + if: matrix.os == 'windows-latest' + run: | + pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py + shell: pwsh + + - name: Upload executable (macOS) + if: matrix.os == 'macos-latest' + uses: actions/upload-artifact@v4 + with: + name: user_interface-macOS + path: user_interface.dmg + + - name: Upload executable (Linux) + if: matrix.os == 'ubuntu-latest' + uses: actions/upload-artifact@v4 + with: + name: user_interface-Linux + path: dist/user_interface + + - name: Upload executable (Windows) + if: matrix.os == 'windows-latest' + uses: actions/upload-artifact@v4 + with: + name: user_interface-Windows + path: dist/user_interface.exe + - name: Create GitHub Release + id: create_release + uses: actions/create-release@v1 + + with: + tag_name: 'taggers' + release_name: Release test + draft: true + prerelease: false + + - name: List files for debugging + run: | + echo "Listing files in dist directory:" + ls assets + + - name: Upload Release Asset (macOS) + uses: actions/upload-release-asset@v1 + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: dist + asset_name: user_interface + asset_content_type: application/octet-stream + + - name: Upload Release Asset (Linux) + uses: actions/upload-release-asset@v1 + + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: dist/ + asset_name: user_interface.app + asset_content_type: application/octet-stream + + - name: Upload Release Asset (Windows) + uses: actions/upload-release-asset@v1 + + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: dist/user_interface + asset_name: user_interface.exe + asset_content_type: application/octet-stream \ No newline at end of file From c4a84ef0489e586fa22351fdb4e9974f6d39cf91 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 18:45:21 -0400 Subject: [PATCH 077/115] trying to use one condensed yml --- .github/workflows/sample.yml | 55 +++++++++++++++--------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index df6eddc4..4c33d55f 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -1,26 +1,19 @@ -name: Create executables and release upload +name: Build and Release on: push: branches: - main - pull_request: - branches: - - main jobs: - build: + build_and_release: strategy: fail-fast: false matrix: - os: - - macos-latest - - ubuntu-latest - - windows-latest + os: [macos-latest, ubuntu-latest, windows-latest] runs-on: ${{ matrix.os }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: - name: Checkout code uses: actions/checkout@v4 @@ -54,7 +47,7 @@ jobs: if: matrix.os == 'macos-latest' run: | pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg + hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO dist/user_interface.dmg shell: bash - name: Create executable (Linux) @@ -69,63 +62,59 @@ jobs: pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py shell: pwsh - - name: Upload executable (macOS) + - name: Upload artifacts (macOS) if: matrix.os == 'macos-latest' uses: actions/upload-artifact@v4 with: name: user_interface-macOS path: user_interface.dmg - - name: Upload executable (Linux) + - name: Upload artifacts (Linux) if: matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Linux - path: dist/user_interface + path: dist/user_interface.app - - name: Upload executable (Windows) + - name: Upload artifacts (Windows) if: matrix.os == 'windows-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Windows path: dist/user_interface.exe + - name: Create GitHub Release id: create_release uses: actions/create-release@v1 - with: - tag_name: 'taggers' + tag_name: 'v0.0.1' release_name: Release test draft: true - prerelease: false - - - name: List files for debugging - run: | - echo "Listing files in dist directory:" - ls assets + prerelease: true - name: Upload Release Asset (macOS) + if: matrix.os == 'macos-latest' uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist - asset_name: user_interface + asset_path: dist/user_interface.dmg + asset_name: user_interface-macOS.dmg asset_content_type: application/octet-stream - name: Upload Release Asset (Linux) + if: matrix.os == 'ubuntu-latest' uses: actions/upload-release-asset@v1 - with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/ - asset_name: user_interface.app + asset_path: dist/user_interface + asset_name: user_interface-Linux asset_content_type: application/octet-stream - name: Upload Release Asset (Windows) + if: matrix.os == 'windows-latest' uses: actions/upload-release-asset@v1 - with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface - asset_name: user_interface.exe - asset_content_type: application/octet-stream \ No newline at end of file + asset_path: dist/user_interface.exe + asset_name: user_interface-Windows.exe + asset_content_type: application/octet-stream From ccc660c9db6275b62b449621070ea0b50ad9dd1c Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 18:48:36 -0400 Subject: [PATCH 078/115] trying to use one condensed yml --- .github/workflows/sample.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 4c33d55f..eb3c1f85 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -2,8 +2,9 @@ name: Build and Release on: push: - branches: + branches: - main + pull_request: null jobs: build_and_release: From 25bf1ccf2484ae18c60148b10b2bb853b900f266 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 18:50:05 -0400 Subject: [PATCH 079/115] making it run on all prs as a test --- .github/workflows/sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index eb3c1f85..75890b46 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -89,7 +89,7 @@ jobs: uses: actions/create-release@v1 with: tag_name: 'v0.0.1' - release_name: Release test + release_name: Release testing notes draft: true prerelease: true From 65d1a765fb52f19bfa61873588f59ed9188a310e Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 19:03:37 -0400 Subject: [PATCH 080/115] add token --- .github/workflows/sample.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 75890b46..81558b8a 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -7,12 +7,14 @@ on: pull_request: null jobs: + build_and_release: strategy: fail-fast: false matrix: os: [macos-latest, ubuntu-latest, windows-latest] - + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} runs-on: ${{ matrix.os }} steps: From 491f228e5a417abb9f252c35af7286231795f4da Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 19:09:42 -0400 Subject: [PATCH 081/115] set proper path for ubuntu and mac --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c984df8e..a0ac32ac 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -119,14 +119,14 @@ jobs: - name: List files for debugging run: | echo "Listing files in dist directory:" - ls assets + ls - name: Upload Release Asset (macOS) uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface.zip - asset_name: user_interface + asset_path: dist/ + asset_name: user_interface.dmg asset_content_type: application/octet-stream - name: Upload Release Asset (Linux) @@ -135,7 +135,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: dist/ - asset_name: user_interface + asset_name: user_interface.app asset_content_type: application/octet-stream - name: Upload Release Asset (Windows) From 5ffe18b49593e0f72caaeea45ac3f336cd14528e Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 19:14:04 -0400 Subject: [PATCH 082/115] add logs, set proper path for ubuntu and mac --- .github/workflows/sample.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 81558b8a..5d9094f8 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -65,6 +65,10 @@ jobs: pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py shell: pwsh + - name: List files for debugging + run: | + echo "Listing files in dist directory:" + ls - name: Upload artifacts (macOS) if: matrix.os == 'macos-latest' uses: actions/upload-artifact@v4 @@ -100,7 +104,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface.dmg + asset_path: dist/user_interface-macOS.dmg asset_name: user_interface-macOS.dmg asset_content_type: application/octet-stream @@ -109,7 +113,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface + asset_path: dist/user_interface-Linux asset_name: user_interface-Linux asset_content_type: application/octet-stream From 2557b196491a29ec6a26a4367ff6d1e02c924dd3 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 20 Jul 2024 19:17:18 -0400 Subject: [PATCH 083/115] improve logs --- .github/workflows/sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 5d9094f8..c8ba4f8c 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -68,7 +68,7 @@ jobs: - name: List files for debugging run: | echo "Listing files in dist directory:" - ls + ls dist - name: Upload artifacts (macOS) if: matrix.os == 'macos-latest' uses: actions/upload-artifact@v4 From 7c2ebe49ca3a54534f27c2ad6cf2c60ca147634d Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 21 Jul 2024 00:01:30 -0400 Subject: [PATCH 084/115] create build and release --- .github/workflows/sample.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index c8ba4f8c..ea3c9f23 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -104,8 +104,8 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface-macOS.dmg - asset_name: user_interface-macOS.dmg + asset_path: dist/user_interface.dmg + asset_name: user_interface.dmg asset_content_type: application/octet-stream - name: Upload Release Asset (Linux) @@ -113,8 +113,8 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface-Linux - asset_name: user_interface-Linux + asset_path: dist/user_interface + asset_name: user_interface asset_content_type: application/octet-stream - name: Upload Release Asset (Windows) From 6814ebd0231eb4332a889e4f00b8c2ec4b973122 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 21 Jul 2024 00:04:36 -0400 Subject: [PATCH 085/115] fix path --- .github/workflows/sample.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index ea3c9f23..3c0d6a11 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -104,7 +104,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface.dmg + asset_path: dist/ asset_name: user_interface.dmg asset_content_type: application/octet-stream @@ -113,7 +113,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface + asset_path: dist/ asset_name: user_interface asset_content_type: application/octet-stream From e5cc982c80f2db88e34748751c6340eb7261299c Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 22 Jul 2024 20:50:01 -0400 Subject: [PATCH 086/115] fix path for uploads --- .github/workflows/sample.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 3c0d6a11..6908615e 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -74,14 +74,14 @@ jobs: uses: actions/upload-artifact@v4 with: name: user_interface-macOS - path: user_interface.dmg + path: dist/user_interface.dmg - name: Upload artifacts (Linux) if: matrix.os == 'ubuntu-latest' uses: actions/upload-artifact@v4 with: name: user_interface-Linux - path: dist/user_interface.app + path: dist/user_interface - name: Upload artifacts (Windows) if: matrix.os == 'windows-latest' @@ -104,7 +104,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/ + asset_path: dist/user_interface.dmg asset_name: user_interface.dmg asset_content_type: application/octet-stream @@ -113,7 +113,7 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/ + asset_path: dist/user_interface asset_name: user_interface asset_content_type: application/octet-stream From 59ce90c279d6af00d1cf8334f8aeae9ed63d7d11 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 22 Jul 2024 21:09:40 -0400 Subject: [PATCH 087/115] create one release draft with all executables --- .github/workflows/sample.yml | 60 +++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 6908615e..c8774112 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -2,19 +2,16 @@ name: Build and Release on: push: - branches: + branches: - main - pull_request: null jobs: - - build_and_release: + build: strategy: fail-fast: false matrix: os: [macos-latest, ubuntu-latest, windows-latest] - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + runs-on: ${{ matrix.os }} steps: @@ -65,10 +62,6 @@ jobs: pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py shell: pwsh - - name: List files for debugging - run: | - echo "Listing files in dist directory:" - ls dist - name: Upload artifacts (macOS) if: matrix.os == 'macos-latest' uses: actions/upload-artifact@v4 @@ -90,38 +83,63 @@ jobs: name: user_interface-Windows path: dist/user_interface.exe + release: + needs: build + runs-on: ubuntu-latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Download macOS artifact + uses: actions/download-artifact@v4 + with: + name: user_interface-macOS + path: ./artifacts/macos + + - name: Download Linux artifact + uses: actions/download-artifact@v4 + with: + name: user_interface-Linux + path: ./artifacts/linux + + - name: Download Windows artifact + uses: actions/download-artifact@v4 + with: + name: user_interface-Windows + path: ./artifacts/windows + - name: Create GitHub Release id: create_release uses: actions/create-release@v1 with: - tag_name: 'v0.0.1' - release_name: Release testing notes + tag_name: 'v1.0.0' + release_name: Release v1.0.0 draft: true - prerelease: true + prerelease: false - name: Upload Release Asset (macOS) - if: matrix.os == 'macos-latest' uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface.dmg - asset_name: user_interface.dmg + asset_path: ./artifacts/macos/user_interface.dmg + asset_name: user_interface-macOS.dmg asset_content_type: application/octet-stream - name: Upload Release Asset (Linux) - if: matrix.os == 'ubuntu-latest' uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface - asset_name: user_interface + asset_path: ./artifacts/linux/user_interface + asset_name: user_interface-Linux asset_content_type: application/octet-stream - name: Upload Release Asset (Windows) - if: matrix.os == 'windows-latest' uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface.exe + asset_path: ./artifacts/windows/user_interface.exe asset_name: user_interface-Windows.exe asset_content_type: application/octet-stream From 1d027cff8d91c7ebc7ec392e1918826ad4a14959 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 22 Jul 2024 21:11:38 -0400 Subject: [PATCH 088/115] take two: create one release draft with all executables --- .github/workflows/sample.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index c8774112..4818f78e 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -11,7 +11,6 @@ jobs: fail-fast: false matrix: os: [macos-latest, ubuntu-latest, windows-latest] - runs-on: ${{ matrix.os }} steps: @@ -62,6 +61,11 @@ jobs: pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py shell: pwsh + - name: List files for debugging + run: | + echo "Listing files in dist directory:" + ls dist + - name: Upload artifacts (macOS) if: matrix.os == 'macos-latest' uses: actions/upload-artifact@v4 @@ -115,17 +119,17 @@ jobs: id: create_release uses: actions/create-release@v1 with: - tag_name: 'v1.0.0' - release_name: Release v1.0.0 + tag_name: 'v0.0.1' + release_name: Release v0.0.1 draft: true - prerelease: false + prerelease: true - name: Upload Release Asset (macOS) uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./artifacts/macos/user_interface.dmg - asset_name: user_interface-macOS.dmg + asset_name: user_interface.dmg asset_content_type: application/octet-stream - name: Upload Release Asset (Linux) @@ -133,7 +137,7 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./artifacts/linux/user_interface - asset_name: user_interface-Linux + asset_name: user_interface asset_content_type: application/octet-stream - name: Upload Release Asset (Windows) From 51cfada3bbbbaf4282fe5617f9be6e108f04073b Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 22 Jul 2024 21:12:41 -0400 Subject: [PATCH 089/115] take three: create one release draft with all executables --- .github/workflows/sample.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 4818f78e..3429338e 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -4,6 +4,7 @@ on: push: branches: - main + pull_request: null jobs: build: From f58d806ea876c8f714831302b1923f5d40cc8f67 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Tue, 23 Jul 2024 21:36:31 -0400 Subject: [PATCH 090/115] create tag dynamically and generate change log --- .github/workflows/sample.yml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 3429338e..f12eeedf 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -1,10 +1,12 @@ -name: Build and Release +name: Build and Create Release on: push: - branches: - - main + branches: + - main pull_request: null +# tags: +# - 'v*.*.*' jobs: build: @@ -62,11 +64,6 @@ jobs: pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py shell: pwsh - - name: List files for debugging - run: | - echo "Listing files in dist directory:" - ls dist - - name: Upload artifacts (macOS) if: matrix.os == 'macos-latest' uses: actions/upload-artifact@v4 @@ -116,12 +113,23 @@ jobs: name: user_interface-Windows path: ./artifacts/windows + - name: Install Ruby + run: sudo apt-get install ruby-full + + - name: Install GitHub Changelog Generator + run: sudo gem install github_changelog_generator + + - name: Generate CHANGELOG + run: | + github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} + - name: Create GitHub Release id: create_release uses: actions/create-release@v1 with: - tag_name: 'v0.0.1' - release_name: Release v0.0.1 + tag_name: {{ github.ref }} + release_name: Release {{ github.ref }} + body_path: CHANGELOG.md draft: true prerelease: true From 0f1de62a5be1f223f5c2fe66ce809fd92ff15bb4 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Tue, 23 Jul 2024 21:38:54 -0400 Subject: [PATCH 091/115] hard code tag for now --- .github/workflows/sample.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index f12eeedf..28065f1f 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -127,8 +127,9 @@ jobs: id: create_release uses: actions/create-release@v1 with: - tag_name: {{ github.ref }} - release_name: Release {{ github.ref }} +# tag_name: {{ github.ref }} + tag_name: 0.0.1 + release_name: Release 0.0.1 body_path: CHANGELOG.md draft: true prerelease: true From 2e3cfac4bea1b27d522a153e4fbc79a8f16579ff Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Tue, 23 Jul 2024 21:54:06 -0400 Subject: [PATCH 092/115] use gitchglg --- .github/workflows/sample.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 28065f1f..570d624d 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -113,15 +113,13 @@ jobs: name: user_interface-Windows path: ./artifacts/windows - - name: Install Ruby - run: sudo apt-get install ruby-full - - - name: Install GitHub Changelog Generator - run: sudo gem install github_changelog_generator + - name: Install git-chglog + run: | + curl -sSL https://github.com/git-chglog/git-chglog/releases/download/v0.15.4/git-chglog_0.15.4_linux_amd64.tar.gz | tar -xz + sudo mv git-chglog /usr/local/bin/ - name: Generate CHANGELOG - run: | - github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} + run: git-chglog -o CHANGELOG.md - name: Create GitHub Release id: create_release From c02c104e9be36509174f6102176e438f4bf52d93 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Tue, 23 Jul 2024 21:58:52 -0400 Subject: [PATCH 093/115] revert "use gitchglg" --- .github/workflows/sample.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml index 570d624d..28065f1f 100644 --- a/.github/workflows/sample.yml +++ b/.github/workflows/sample.yml @@ -113,13 +113,15 @@ jobs: name: user_interface-Windows path: ./artifacts/windows - - name: Install git-chglog - run: | - curl -sSL https://github.com/git-chglog/git-chglog/releases/download/v0.15.4/git-chglog_0.15.4_linux_amd64.tar.gz | tar -xz - sudo mv git-chglog /usr/local/bin/ + - name: Install Ruby + run: sudo apt-get install ruby-full + + - name: Install GitHub Changelog Generator + run: sudo gem install github_changelog_generator - name: Generate CHANGELOG - run: git-chglog -o CHANGELOG.md + run: | + github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} - name: Create GitHub Release id: create_release From f26d0e8dc3c06fd2b3390e0d55eab19c05b5bda0 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 27 Jul 2024 10:13:13 -0400 Subject: [PATCH 094/115] rename action --- .github/workflows/{sample.yml => release.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{sample.yml => release.yml} (100%) diff --git a/.github/workflows/sample.yml b/.github/workflows/release.yml similarity index 100% rename from .github/workflows/sample.yml rename to .github/workflows/release.yml From d04acb9585a03e30e755eb34165bdc07c1a7deb1 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 27 Jul 2024 10:14:20 -0400 Subject: [PATCH 095/115] delete old action --- .github/workflows/deploy.yml | 148 ----------------------------------- 1 file changed, 148 deletions(-) delete mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index a0ac32ac..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,148 +0,0 @@ -name: Create Release Artifacts - -on: - push: -# branches: -# - main -# pull_request: null - tags: - - 'v*.*.*' - -jobs: - build: - strategy: - fail-fast: false - matrix: - os: [macos-latest, ubuntu-latest, windows-latest] - - runs-on: ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - - name: Install dependencies (Bash) - if: runner.os != 'Windows' - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install pyinstaller - pip install yahooquery - pip install tkmacosx - shell: bash - - - name: Install dependencies (PowerShell) - if: runner.os == 'Windows' - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install pyinstaller - pip install yahooquery - pip install tkmacosx - shell: pwsh - - - name: Create executable (macOS) - if: matrix.os == 'macos-latest' - run: | - pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - hdiutil create -volname UserInterface -srcfolder dist/ -ov -format UDZO user_interface.dmg - shell: bash - - - name: Create executable (Linux) - if: matrix.os == 'ubuntu-latest' - run: | - pyinstaller --onefile --noconsole --add-data "assets:assets" user_interface.py - shell: bash - - - name: Create executable (Windows) - if: matrix.os == 'windows-latest' - run: | - pyinstaller --onefile --noconsole --add-data "assets;assets" user_interface.py - shell: pwsh - - - name: Upload artifacts (macOS) - if: matrix.os == 'macos-latest' - uses: actions/upload-artifact@v4 - with: - name: user_interface-macOS - path: - dist/ - dist/user_interface.zip - - - name: Upload artifacts (Linux) - if: matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v4 - with: - name: user_interface-Linux - path: - dist/ - dist/user_interface.zip - - - name: Upload artifacts (Windows) - if: matrix.os == 'windows-latest' - uses: actions/upload-artifact@v4 - with: - name: user_interface-Windows - path: - dist/ - dist/user_interface.zip - - - name: List files for debugging - run: | - echo "Listing files in dist directory:" - ls dist/ - release: - - needs: build - runs-on: ubuntu-latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Create GitHub Release - id: create_release - uses: actions/create-release@v1 - - with: - tag_name: 'taggers' - release_name: Release test - draft: true - prerelease: false - - - name: List files for debugging - run: | - echo "Listing files in dist directory:" - ls - - - name: Upload Release Asset (macOS) - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/ - asset_name: user_interface.dmg - asset_content_type: application/octet-stream - - - name: Upload Release Asset (Linux) - uses: actions/upload-release-asset@v1 - - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/ - asset_name: user_interface.app - asset_content_type: application/octet-stream - - - name: Upload Release Asset (Windows) - uses: actions/upload-release-asset@v1 - - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: dist/user_interface - asset_name: user_interface - asset_content_type: application/octet-stream From 32414feac58c498964ba840cd60e5bb485235e7b Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 28 Jul 2024 19:39:11 -0400 Subject: [PATCH 096/115] create release based on tags --- .github/workflows/release.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 28065f1f..8bfb9a23 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,11 +2,11 @@ name: Build and Create Release on: push: - branches: - - main - pull_request: null -# tags: -# - 'v*.*.*' +# branches: +# - main +# pull_request: null + tags: + - 'v*.*.*' jobs: build: @@ -127,9 +127,8 @@ jobs: id: create_release uses: actions/create-release@v1 with: -# tag_name: {{ github.ref }} - tag_name: 0.0.1 - release_name: Release 0.0.1 + tag_name: {{ github.ref }} + release_name: Release {{ github.ref }} body_path: CHANGELOG.md draft: true prerelease: true From ad2f8974ed872d89bc9abd7f3538c1c5106034da Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 16:14:15 -0400 Subject: [PATCH 097/115] fix change log --- .github/workflows/release.yml | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bfb9a23..4e363206 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,11 +2,11 @@ name: Build and Create Release on: push: -# branches: -# - main -# pull_request: null - tags: - - 'v*.*.*' + branches: + - main + pull_request: null +# tags: +# - 'v*.*.*' jobs: build: @@ -121,17 +121,26 @@ jobs: - name: Generate CHANGELOG run: | - github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} + github_changelog_generator -u your-github-username -p your-repository-name \ + --token ${{ secrets.GITHUB_TOKEN }} \ + --exclude-labels "ignore-for-release, dependencies" \ + --exclude-tags-regex "^v" \ + --categories "Infrastructure Changes 🛠:Infra, Tests" \ + "Exciting New Features 🎉:enhancement" \ + "Bug Fixes 🐛:Semver-Minor,bug-fix" \ + "Other Changes:*" + env: + CHANGELOG_PATH: ./CHANGELOG.md - name: Create GitHub Release id: create_release uses: actions/create-release@v1 with: - tag_name: {{ github.ref }} - release_name: Release {{ github.ref }} + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} body_path: CHANGELOG.md - draft: true - prerelease: true + draft: false + prerelease: false - name: Upload Release Asset (macOS) uses: actions/upload-release-asset@v1 From 78c354ea065f580542e82f9560b998e4e0c0e4fd Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 16:25:04 -0400 Subject: [PATCH 098/115] fix sections --- .github/workflows/release.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e363206..ab0b10ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,12 +123,11 @@ jobs: run: | github_changelog_generator -u your-github-username -p your-repository-name \ --token ${{ secrets.GITHUB_TOKEN }} \ - --exclude-labels "ignore-for-release, dependencies" \ --exclude-tags-regex "^v" \ - --categories "Infrastructure Changes 🛠:Infra, Tests" \ - "Exciting New Features 🎉:enhancement" \ - "Bug Fixes 🐛:Semver-Minor,bug-fix" \ - "Other Changes:*" + --pr-label "Infrastructure Changes 🛠:Infra, Tests" \ + --enhancement-label "Exciting New Features 🎉:enhancement" \ + --pr-label "bug-fix" \ + --exclude-labels "dependencies" env: CHANGELOG_PATH: ./CHANGELOG.md From 6e7bc62e563489951f4073693e1a15f4e5202460 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 16:33:02 -0400 Subject: [PATCH 099/115] fix sections format --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab0b10ff..516db246 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,9 +123,9 @@ jobs: run: | github_changelog_generator -u your-github-username -p your-repository-name \ --token ${{ secrets.GITHUB_TOKEN }} \ - --exclude-tags-regex "^v" \ - --pr-label "Infrastructure Changes 🛠:Infra, Tests" \ - --enhancement-label "Exciting New Features 🎉:enhancement" \ + --pr-label "Infra" \ + --pr-label "Tests" \ + --enhancement-label "enhancement" \ --pr-label "bug-fix" \ --exclude-labels "dependencies" env: From a3663f112079d70d7021c4bdafd5e8be31d70b4f Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 16:38:30 -0400 Subject: [PATCH 100/115] dummy tag --- .github/workflows/release.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 516db246..17563413 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -135,8 +135,9 @@ jobs: id: create_release uses: actions/create-release@v1 with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} + tag_name: 0.0.1 +# tag_name: ${{ github.ref }} + release_name: Release 0.0.1 body_path: CHANGELOG.md draft: false prerelease: false From d9d88d291edf0f3896d6da54c4842224aecaf3a2 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 16:45:10 -0400 Subject: [PATCH 101/115] fix command --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 17563413..b2e998ae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -121,7 +121,7 @@ jobs: - name: Generate CHANGELOG run: | - github_changelog_generator -u your-github-username -p your-repository-name \ + github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} \ --token ${{ secrets.GITHUB_TOKEN }} \ --pr-label "Infra" \ --pr-label "Tests" \ From 74624d4d1fa15dcd37eef95aa840720b58ed7d1b Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 17:43:57 -0400 Subject: [PATCH 102/115] fix changelog --- .github/workflows/release.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2e998ae..3ea4f6e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,12 +122,11 @@ jobs: - name: Generate CHANGELOG run: | github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} \ - --token ${{ secrets.GITHUB_TOKEN }} \ - --pr-label "Infra" \ - --pr-label "Tests" \ - --enhancement-label "enhancement" \ - --pr-label "bug-fix" \ - --exclude-labels "dependencies" + --enhancement-label "Exciting New Features 🎉" \ + --add-sections "[\"Infra Changes 🛠\",\"Tests Changes 🤖\",\"Bug Fixes 🐛\"]" \ + --label-section-map "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ + --exclude-labels "dependencies" + env: CHANGELOG_PATH: ./CHANGELOG.md From dc30ee79eb91d6e2b64b2a7a81806f669fbe040c Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 17:44:19 -0400 Subject: [PATCH 103/115] fix changelog text --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ea4f6e4..f65aeff8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,7 +122,7 @@ jobs: - name: Generate CHANGELOG run: | github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} \ - --enhancement-label "Exciting New Features 🎉" \ + --enhancement-label "New Features 🎉" \ --add-sections "[\"Infra Changes 🛠\",\"Tests Changes 🤖\",\"Bug Fixes 🐛\"]" \ --label-section-map "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ --exclude-labels "dependencies" From d9a792a1cfa9adb3709558166da1d1132cd65ac4 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 18:03:32 -0400 Subject: [PATCH 104/115] add sections --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f65aeff8..996df151 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -124,7 +124,7 @@ jobs: github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} \ --enhancement-label "New Features 🎉" \ --add-sections "[\"Infra Changes 🛠\",\"Tests Changes 🤖\",\"Bug Fixes 🐛\"]" \ - --label-section-map "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ + --configure-sections "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ --exclude-labels "dependencies" env: From 504f6dd4050eb9bdc78342a15702a242ac1eed58 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 18:24:43 -0400 Subject: [PATCH 105/115] fix hard coded tag --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 996df151..9a00ee6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,9 +134,9 @@ jobs: id: create_release uses: actions/create-release@v1 with: - tag_name: 0.0.1 + tag_name: 0.0.11 # tag_name: ${{ github.ref }} - release_name: Release 0.0.1 + release_name: Release 0.0.11 body_path: CHANGELOG.md draft: false prerelease: false From 2275d8a69ff6fc832920afc2bf05933e466f81d3 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 18:31:25 -0400 Subject: [PATCH 106/115] fix sections --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9a00ee6b..e40a0087 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,8 +123,7 @@ jobs: run: | github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} \ --enhancement-label "New Features 🎉" \ - --add-sections "[\"Infra Changes 🛠\",\"Tests Changes 🤖\",\"Bug Fixes 🐛\"]" \ - --configure-sections "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ + --add-sections "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ --exclude-labels "dependencies" env: From 8e1c3100bdf1b7f18976db086cabf84d0b97981c Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Mon, 29 Jul 2024 18:41:53 -0400 Subject: [PATCH 107/115] configure section --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e40a0087..af4a2df8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -123,7 +123,7 @@ jobs: run: | github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} \ --enhancement-label "New Features 🎉" \ - --add-sections "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ + --configure-sections "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ --exclude-labels "dependencies" env: From 84d355f1cfabf9edc190d4534f4afe01593516dd Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 3 Aug 2024 10:57:15 -0400 Subject: [PATCH 108/115] keep the changelog generator simple --- .github/workflows/release.yml | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af4a2df8..dec4323d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,11 +2,11 @@ name: Build and Create Release on: push: - branches: - - main - pull_request: null -# tags: -# - 'v*.*.*' +# branches: +# - main +# pull_request: null + tags: + - 'v*.*.*' jobs: build: @@ -121,24 +121,17 @@ jobs: - name: Generate CHANGELOG run: | - github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} \ - --enhancement-label "New Features 🎉" \ - --configure-sections "{\"Infra Changes 🛠\": [\"Infra\", \"infrastructure\"], \"Tests Changes 🤖\": [\"Tests\", \"tests\"], \"Bug Fixes 🐛\": [\"bug\", \"bug-fix\"]}" \ - --exclude-labels "dependencies" - - env: - CHANGELOG_PATH: ./CHANGELOG.md + github_changelog_generator -u cortisiko -p stockAnalysis --token ${{ secrets.GITHUB_TOKEN }} - name: Create GitHub Release id: create_release uses: actions/create-release@v1 with: - tag_name: 0.0.11 -# tag_name: ${{ github.ref }} - release_name: Release 0.0.11 + tag_name: {{ github.ref }} + release_name: Release {{ github.ref }} body_path: CHANGELOG.md - draft: false - prerelease: false + draft: true + prerelease: true - name: Upload Release Asset (macOS) uses: actions/upload-release-asset@v1 @@ -162,4 +155,4 @@ jobs: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./artifacts/windows/user_interface.exe asset_name: user_interface-Windows.exe - asset_content_type: application/octet-stream + asset_content_type: application/octet-stream \ No newline at end of file From cea1f6c207d1c722b503d431e6893437da57b078 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 3 Aug 2024 11:05:40 -0400 Subject: [PATCH 109/115] fix mapping --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dec4323d..2a6ab8a7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,8 +127,8 @@ jobs: id: create_release uses: actions/create-release@v1 with: - tag_name: {{ github.ref }} - release_name: Release {{ github.ref }} + tag_name: v{{ github.ref }} + release_name: Release v{{ github.ref }} body_path: CHANGELOG.md draft: true prerelease: true From 916cc15799c99991edac4dc22f70aa96176e9176 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 3 Aug 2024 11:15:20 -0400 Subject: [PATCH 110/115] fix release name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2a6ab8a7..03e79c32 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -128,7 +128,7 @@ jobs: uses: actions/create-release@v1 with: tag_name: v{{ github.ref }} - release_name: Release v{{ github.ref }} + release_name: Release {{ github.ref }} body_path: CHANGELOG.md draft: true prerelease: true From 07cc229fcc0c41c2af6458a3ed77fceeb6635625 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sat, 3 Aug 2024 13:25:08 -0400 Subject: [PATCH 111/115] fix release name --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03e79c32..dec4323d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,7 +127,7 @@ jobs: id: create_release uses: actions/create-release@v1 with: - tag_name: v{{ github.ref }} + tag_name: {{ github.ref }} release_name: Release {{ github.ref }} body_path: CHANGELOG.md draft: true From 6b86b2c3db88de65a6f6b3d580cf8779f5ae7e2c Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 4 Aug 2024 16:30:40 -0400 Subject: [PATCH 112/115] script to build the apps + a changelog template --- .github/workflows/create-apps.yml | 8 +++----- CHANGELOG.md | 12 ++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.github/workflows/create-apps.yml b/.github/workflows/create-apps.yml index a459caa2..52940873 100644 --- a/.github/workflows/create-apps.yml +++ b/.github/workflows/create-apps.yml @@ -2,11 +2,9 @@ name: Create executables on: push: -# branches: -# - main -# pull_request: null - tags: - - 'v*.*.*' + branches: + - main + pull_request: null jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..59d56147 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,12 @@ +# Changelog + +## DRAFT + +### New Features 🎉 + +### Infra Changes 🛠 + +### Tests Changes 🤖 + +### Bug Fixes 🐛 + From 1faca2397bc6820fa31c136d0bced2fc2f28caae Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 4 Aug 2024 16:48:17 -0400 Subject: [PATCH 113/115] run app builds only when label is applied --- .github/workflows/create-apps.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-apps.yml b/.github/workflows/create-apps.yml index 52940873..d35b1d1c 100644 --- a/.github/workflows/create-apps.yml +++ b/.github/workflows/create-apps.yml @@ -1,13 +1,14 @@ name: Create executables on: - push: - branches: - - main - pull_request: null + pull_request: + branches: + - main + types: [labeled] jobs: build: + if: contains(github.event.issue.labels.*.name, 'create-builds') strategy: fail-fast: false matrix: From dddb8cb5cbce5f547783d8c14f8366cc5e2b6ba5 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 4 Aug 2024 17:10:36 -0400 Subject: [PATCH 114/115] test commit to see if job would rerun after label is applied --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59d56147..984fcde3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,5 @@ # Changelog -## DRAFT ### New Features 🎉 From 0beec83b6f9fc4b0f8d6277c351b72d6ac963ae6 Mon Sep 17 00:00:00 2001 From: Cortisiko Date: Sun, 4 Aug 2024 17:19:23 -0400 Subject: [PATCH 115/115] fix create script to ensure to run when label is applied --- .github/workflows/create-apps.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/create-apps.yml b/.github/workflows/create-apps.yml index d35b1d1c..ce880f3a 100644 --- a/.github/workflows/create-apps.yml +++ b/.github/workflows/create-apps.yml @@ -2,13 +2,11 @@ name: Create executables on: pull_request: - branches: - - main types: [labeled] jobs: build: - if: contains(github.event.issue.labels.*.name, 'create-builds') + if: contains(github.event.pull_request.labels.*.name, 'create-builds') strategy: fail-fast: false matrix: