From 19bff8cb4e915f24d758d07a2d03643c04b10c34 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 12 Oct 2022 12:00:54 +0200 Subject: [PATCH 01/39] attempt fixing macOS builds --- .github/workflows/build_multiplatform.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 4f2b8cfa..139f5642 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -296,7 +296,16 @@ jobs: - name: Display structure of downloaded files run: ls -R - - name: Build binaries + - name: Build binaries macOS + if: ${{startsWith(matrix.os, 'macos')}} + working-directory: tnc + run: | + python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --macos-create-app-bundle --standalone daemon.py + python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --macos-create-app-bundle --standalone main.py + + + - name: Build binaries Linux and Windows + if: ${{!startsWith(matrix.os, 'macos')}} working-directory: tnc run: | # pyinstaller freedata.spec From b97db66736fee276843285faa27d7f413dd14c14 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 12 Oct 2022 16:38:23 +0200 Subject: [PATCH 02/39] attempt with virtualenv --- .github/workflows/build_multiplatform.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 139f5642..1ed894b6 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -252,10 +252,17 @@ jobs: - name: Install MacOS pyAudio if: ${{startsWith(matrix.os, 'macos')}} run: | + brew install virtualenv + virtualenv -p python3 venv + cd venv + chmod +x /bin/activate + source ./bin/activate + ./bin/activate brew install portaudio python -m pip install --upgrade pip pip3 install pyaudio + - name: Install Python dependencies run: | python -m pip install --upgrade pip @@ -300,8 +307,8 @@ jobs: if: ${{startsWith(matrix.os, 'macos')}} working-directory: tnc run: | - python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --macos-create-app-bundle --standalone daemon.py - python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --macos-create-app-bundle --standalone main.py + python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone daemon.py + python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone main.py - name: Build binaries Linux and Windows From 63d47cb7459adb663b2dff98c84233b5f966bd6a Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 12 Oct 2022 17:07:10 +0200 Subject: [PATCH 03/39] attempt with virtualenv --- .github/workflows/build_multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 1ed894b6..2e46b123 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -255,8 +255,8 @@ jobs: brew install virtualenv virtualenv -p python3 venv cd venv - chmod +x /bin/activate - source ./bin/activate + chmod +x /venv/bin/activate + source ./venv/bin/activate ./bin/activate brew install portaudio python -m pip install --upgrade pip From 32a01a58598e753222c6f76b5484da5e177cc1ad Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 12 Oct 2022 19:03:05 +0200 Subject: [PATCH 04/39] attempt with virtualenv --- .github/workflows/build_multiplatform.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 2e46b123..7373fc58 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -255,7 +255,6 @@ jobs: brew install virtualenv virtualenv -p python3 venv cd venv - chmod +x /venv/bin/activate source ./venv/bin/activate ./bin/activate brew install portaudio From b125f36a1331dafdd239c3dbd2b112265a108d26 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Wed, 12 Oct 2022 19:20:23 +0200 Subject: [PATCH 05/39] attempt with virtualenv --- .github/workflows/build_multiplatform.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 7373fc58..6e0eb425 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -256,7 +256,6 @@ jobs: virtualenv -p python3 venv cd venv source ./venv/bin/activate - ./bin/activate brew install portaudio python -m pip install --upgrade pip pip3 install pyaudio From 7efad9479caddc330d0b0b55ebf99c197a601ed3 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 13 Oct 2022 08:58:18 +0200 Subject: [PATCH 06/39] changed source folder --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 6e0eb425..eba3440d 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -255,7 +255,7 @@ jobs: brew install virtualenv virtualenv -p python3 venv cd venv - source ./venv/bin/activate + source ./bin/activate brew install portaudio python -m pip install --upgrade pip pip3 install pyaudio From 5516985f490d963902acdd142879737056cd50dd Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 13 Oct 2022 09:53:53 +0200 Subject: [PATCH 07/39] moved to pyinstaller for macOS --- .github/workflows/build_multiplatform.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index eba3440d..33a1d042 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -252,10 +252,10 @@ jobs: - name: Install MacOS pyAudio if: ${{startsWith(matrix.os, 'macos')}} run: | - brew install virtualenv - virtualenv -p python3 venv - cd venv - source ./bin/activate + #brew install virtualenv + #virtualenv -p python3 venv + #cd venv + #source ./bin/activate brew install portaudio python -m pip install --upgrade pip pip3 install pyaudio @@ -305,9 +305,13 @@ jobs: if: ${{startsWith(matrix.os, 'macos')}} working-directory: tnc run: | - python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone daemon.py - python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone main.py - + #python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone daemon.py + #python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone main.py + pyinstaller freedata.spec + cp -r -f dist/tnc/* dist/ + cp -r -f dist/daemon/* dist/ + rm -r * dist/tnc + rm -r * dist/daemon - name: Build binaries Linux and Windows if: ${{!startsWith(matrix.os, 'macos')}} From a67d6cb4502936485eb19a805d1b62e681b7a951 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 13 Oct 2022 10:03:47 +0200 Subject: [PATCH 08/39] moved to pyinstaller for macOS --- .github/workflows/build_multiplatform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 33a1d042..77696e46 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -276,6 +276,7 @@ jobs: # curl.exe --output PyAudio-0.2.11-cp39-cp39-win_amd64.whl --url https://download.lfd.uci.edu/pythonlibs/y2rycu7g/PyAudio-0.2.11-cp39-cp39-win_amd64.whl # pip install PyAudio-0.2.11-cp39-cp39-win_amd64.whl pip install nuitka + pip install pyinstaller pip install ordered-set From c93cba9bc06ec6f88ad9bca0ba56f1815eba9972 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 13 Oct 2022 10:15:51 +0200 Subject: [PATCH 09/39] moved to pyinstaller for macOS --- .github/workflows/build_multiplatform.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 77696e46..22da0dd7 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -310,9 +310,7 @@ jobs: #python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone main.py pyinstaller freedata.spec cp -r -f dist/tnc/* dist/ - cp -r -f dist/daemon/* dist/ rm -r * dist/tnc - rm -r * dist/daemon - name: Build binaries Linux and Windows if: ${{!startsWith(matrix.os, 'macos')}} @@ -327,8 +325,8 @@ jobs: - name: LIST ALL FILES run: ls -R - - name: Copy binaries - Linux and MacOS - if: ${{!startsWith(matrix.os, 'windows')}} + - name: Copy binaries - Linux + if: ${{startsWith(matrix.os, 'ubuntu')}} working-directory: tnc run: | cp -r -f daemon.dist/* dist/ @@ -346,6 +344,7 @@ jobs: cp -r -Force main.dist/* dist/ - name: Rename tnc binaries + if: ${{!startsWith(matrix.os, 'macos')}} working-directory: tnc run: | mv dist/daemon* dist/${{ matrix.daemon_binary_name }} From 03f5f8dccec8d7f348996bcfb9b0ae3eee86a855 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Thu, 13 Oct 2022 10:36:04 +0200 Subject: [PATCH 10/39] fixed folder cleanup for macOS --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 22da0dd7..604ea8da 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -310,7 +310,7 @@ jobs: #python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone main.py pyinstaller freedata.spec cp -r -f dist/tnc/* dist/ - rm -r * dist/tnc + rm -r dist/tnc - name: Build binaries Linux and Windows if: ${{!startsWith(matrix.os, 'macos')}} From 18f670bac71b40216cfbcd9a9a363b3fe8434061 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Sun, 16 Oct 2022 15:56:14 +0200 Subject: [PATCH 11/39] check if portaudio already downlaoded --- .github/workflows/build_multiplatform.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 604ea8da..4ec34d7f 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -353,7 +353,10 @@ jobs: - name: Download Portaudio binaries working-directory: tnc run: | + if ! test -f "dist/_sounddevice_data/portaudio-binaries/libportaudio.dylib"; then git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries + fi + #- uses: actions/download-artifact@v3 # with: From f21069e29ddcdd070fff37321d14a1ca12240b9d Mon Sep 17 00:00:00 2001 From: dj2ls Date: Sun, 16 Oct 2022 15:58:03 +0200 Subject: [PATCH 12/39] check if portaudio already downloaded --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 4ec34d7f..daf59004 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -353,7 +353,7 @@ jobs: - name: Download Portaudio binaries working-directory: tnc run: | - if ! test -f "dist/_sounddevice_data/portaudio-binaries/libportaudio.dylib"; then + if ! test -d "dist/_sounddevice_data"; then git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries fi From 9053e2f57fe8468583ed43be8f509d80de6b5dd8 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Sun, 16 Oct 2022 16:44:59 +0200 Subject: [PATCH 13/39] attempt making bash available for windows... --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index daf59004..703fef25 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -353,7 +353,7 @@ jobs: - name: Download Portaudio binaries working-directory: tnc run: | - if ! test -d "dist/_sounddevice_data"; then + if (! test -d "dist/_sounddevice_data"); then git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries fi From 53d038369613d441e236c8c19332e85685a37e45 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Sun, 16 Oct 2022 17:08:54 +0200 Subject: [PATCH 14/39] attempt making bash available for windows... --- .github/workflows/build_multiplatform.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 703fef25..be4bb45f 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -350,13 +350,19 @@ jobs: mv dist/daemon* dist/${{ matrix.daemon_binary_name }} mv dist/main* dist/${{ matrix.tnc_binary_name }} - - name: Download Portaudio binaries + - name: Download Portaudio binaries Linux macOS + if: ${{!startsWith(matrix.os, 'windows')}} working-directory: tnc run: | - if (! test -d "dist/_sounddevice_data"); then + if ! test -d "dist/_sounddevice_data"; then git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries fi + - name: Download Portaudio binaries Windows + if: ${{startsWith(matrix.os, 'windows')}} + working-directory: tnc + run: | + git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries #- uses: actions/download-artifact@v3 # with: From a68d2c176ab5fabb429f4d9c5fc22be621c43a90 Mon Sep 17 00:00:00 2001 From: dj2ls Date: Sun, 16 Oct 2022 17:12:11 +0200 Subject: [PATCH 15/39] attempt making bash available for windows... --- .github/workflows/build_multiplatform.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index be4bb45f..9ccf6a71 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -362,8 +362,11 @@ jobs: if: ${{startsWith(matrix.os, 'windows')}} working-directory: tnc run: | - git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries - + if(Test-Path -Path "dist/_sounddevice_data"){ + echo "already exists" + } else { + git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries + } #- uses: actions/download-artifact@v3 # with: # path: tnc/dist/codec2 From a9c415c59e83643cd987a8d6f813c22c08beb42c Mon Sep 17 00:00:00 2001 From: dj2ls Date: Sun, 16 Oct 2022 18:17:09 +0200 Subject: [PATCH 16/39] fixing codefactor problem --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 9ccf6a71..23461d15 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -365,7 +365,7 @@ jobs: if(Test-Path -Path "dist/_sounddevice_data"){ echo "already exists" } else { - git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries + git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries } #- uses: actions/download-artifact@v3 # with: From 1bd6537d64f87abe4150fea6aa0dc2e9e71a8e5c Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:15:23 +0100 Subject: [PATCH 17/39] attempt fixing macOS build with new build steps --- .github/workflows/build_multiplatform.yml | 174 +++++++++------------- 1 file changed, 70 insertions(+), 104 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 23461d15..c0e594c8 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -233,51 +233,54 @@ jobs: with: python-version: 3.9 + - name: Install Node.js, NPM and Yarn + uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Create tnc/dist working-directory: tnc run: | mkdir -p dist - - name: Download libcodec2 artifact + - name: Create tnc/dist/tnc + working-directory: tnc + run: | + mkdir -p dist/tnc + + ##- name: Download libcodec2 artifact TNC DIST + ## uses: actions/download-artifact@v3 + ## with: + ## path: tnc/dist/codec2 + + - name: create tnc/lib/codec2 + working-directory: tnc/lib/ + run: | + mkdir codec2 + + - name: Download libcodec2 artifact TNC LIB uses: actions/download-artifact@v3 with: - path: tnc/dist/codec2 + path: tnc/lib/codec2 + - name: Install Linux dependencies # if: matrix.os == 'ubuntu-20.04' if: ${{startsWith(matrix.os, 'ubuntu')}} run: | - sudo apt install -y portaudio19-dev libhamlib-dev libhamlib-utils build-essential cmake python3-libhamlib2 + sudo apt install -y portaudio19-dev libhamlib-dev libhamlib-utils build-essential cmake python3-libhamlib2 patchelf - name: Install MacOS pyAudio if: ${{startsWith(matrix.os, 'macos')}} run: | - #brew install virtualenv - #virtualenv -p python3 venv - #cd venv - #source ./bin/activate brew install portaudio python -m pip install --upgrade pip pip3 install pyaudio - - name: Install Python dependencies run: | python -m pip install --upgrade pip - pip install psutil - pip install crcengine - # pip install 'pyinstaller<5.1' - pip install ujson - pip install pyserial - pip install numpy - pip install structlog - pip install colorama - pip install sounddevice - # curl.exe --output PyAudio-0.2.11-cp39-cp39-win_amd64.whl --url https://download.lfd.uci.edu/pythonlibs/y2rycu7g/PyAudio-0.2.11-cp39-cp39-win_amd64.whl - # pip install PyAudio-0.2.11-cp39-cp39-win_amd64.whl - pip install nuitka - pip install pyinstaller - pip install ordered-set + pip install -r requirements.txt # - name: Install Pyaudio Windows @@ -299,8 +302,6 @@ jobs: # with: # path: tnc/lib/codec2 - - name: Display structure of downloaded files - run: ls -R - name: Build binaries macOS if: ${{startsWith(matrix.os, 'macos')}} @@ -322,105 +323,44 @@ jobs: python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone daemon.py python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone main.py - - name: LIST ALL FILES - run: ls -R + - name: Copy binaries - Linux if: ${{startsWith(matrix.os, 'ubuntu')}} working-directory: tnc run: | - cp -r -f daemon.dist/* dist/ - cp -r -f main.dist/* dist/ - - - name: LIST ALL FILES - run: ls -R + cp -r -f daemon.dist/* dist/tnc + cp -r -f main.dist/* dist/tnc - name: Copy binaries - Windows if: ${{startsWith(matrix.os, 'windows')}} working-directory: tnc # These are powershell aliases, not UNIX commands. run: | - cp -r -Force daemon.dist/* dist/ - cp -r -Force main.dist/* dist/ + cp -r -Force daemon.dist/* dist/tnc + cp -r -Force main.dist/* dist/tnc - name: Rename tnc binaries - if: ${{!startsWith(matrix.os, 'macos')}} working-directory: tnc run: | - mv dist/daemon* dist/${{ matrix.daemon_binary_name }} - mv dist/main* dist/${{ matrix.tnc_binary_name }} + mv dist/tnc/daemon* dist/tnc/${{ matrix.daemon_binary_name }} + mv dist/tnc/main* dist/tnc/${{ matrix.tnc_binary_name }} - - name: Download Portaudio binaries Linux macOS - if: ${{!startsWith(matrix.os, 'windows')}} - working-directory: tnc - run: | - if ! test -d "dist/_sounddevice_data"; then - git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries - fi - - - name: Download Portaudio binaries Windows - if: ${{startsWith(matrix.os, 'windows')}} - working-directory: tnc - run: | - if(Test-Path -Path "dist/_sounddevice_data"){ - echo "already exists" - } else { - git clone https://github.com/spatialaudio/portaudio-binaries dist/_sounddevice_data/portaudio-binaries - } - #- uses: actions/download-artifact@v3 - # with: - # path: tnc/dist/codec2 + - uses: actions/download-artifact@v3 + with: + path: tnc/dist/tnc - name: LIST ALL FILES run: ls -R - #- name: Compress TNC - # # if: ${{!startsWith(matrix.os, 'windows') }} - # shell: bash - # run: | - # cd ./tnc/dist - # zip -r ./${{ matrix.zip_name }}.zip * - - - name: Copy TNC to GUI + - name: Download Portaudio binaries + working-directory: tnc run: | - # cp -R ./tnc/dist/tnc ./gui/tnc - cp -R ./tnc/dist ./gui/tnc + git clone https://github.com/spatialaudio/portaudio-binaries dist/tnc/_sounddevice_data/portaudio-binaries - name: LIST ALL FILES run: ls -R - - name: Compress TNC - uses: thedoctor0/zip-release@master - with: - type: 'zip' - filename: '${{ matrix.zip_name }}.zip' - # directory: ./tnc/dist/tnc - directory: ./tnc/dist - path: . - # exclusions: '*.git* /*node_modules/* .editorconfig' - - - name: LIST ALL FILES - run: ls -R - - - name: Upload TNC artifacts - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.zip_name }}.zip - # path: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip - path: ./tnc/dist/${{ matrix.zip_name }}.zip - - - name: Install Node.js, NPM and Yarn - uses: actions/setup-node@v3 - with: - node-version: 16 - - - name: Release TNC - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/v') - with: - # files: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip - files: ./tnc/dist/${{ matrix.zip_name }}.zip - - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 with: @@ -431,12 +371,38 @@ jobs: release: ${{ startsWith(github.ref, 'refs/tags/v') }} args: ${{ matrix.electron_parameters }} + - name: Compress TNC + uses: thedoctor0/zip-release@master + with: + type: 'zip' + filename: '${{ matrix.zip_name }}.zip' + # directory: ./tnc/dist/tnc + directory: ./tnc/dist/tnc + path: . + # exclusions: '*.git* /*node_modules/* .editorconfig' + + - name: Release TNC + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/v') + with: + files: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip + #files: ./tnc/dist/${{ matrix.zip_name }}.zip + - name: LIST ALL FILES run: ls -R - - name: Upload App bundle artifacts - uses: actions/upload-artifact@v3 - with: - name: app_bundle_${{ matrix.os }}.zip - # path: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip - path: ./gui/dist/* + #- name: Upload TNC artifacts + # uses: actions/upload-artifact@v3 + # if: ${{!startsWith(github.ref, 'refs/tags/v')}} + # with: + # name: ${{ matrix.zip_name }}.zip + # # path: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip + # path: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip# + + #- name: Upload App bundle artifacts + # uses: actions/upload-artifact@v3 + # if: ${{!startsWith(github.ref, 'refs/tags/v')}} + # with: + # name: app_bundle_${{ matrix.os }}.zip + # # path: ./tnc/dist/tnc/${{ matrix.zip_name }}.zip + # path: ./gui/dist/* \ No newline at end of file From 93d238d4e1377c6b222804828534bed1d68b692f Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:49:35 +0100 Subject: [PATCH 18/39] force overwriting output files for pyinstaller --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 85859166..da01512a 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -309,7 +309,7 @@ jobs: run: | #python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone daemon.py #python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone main.py - pyinstaller freedata.spec + pyinstaller -y freedata.spec cp -r -f dist/tnc/* dist/ rm -r dist/tnc From 4687dd36e70968fa2581b04e6d4aa59f8f66a135 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 20 Jan 2023 13:24:17 +0100 Subject: [PATCH 19/39] don't rename for macos --- .github/workflows/build_multiplatform.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index da01512a..d40fddbf 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -339,6 +339,8 @@ jobs: cp -r -Force main.dist/* dist/tnc - name: Rename tnc binaries + # we don't need renaming for pyinstaller builds as output name is defined + if: ${{!startsWith(matrix.os, 'macos')}} working-directory: tnc run: | mv dist/tnc/daemon* dist/tnc/${{ matrix.daemon_binary_name }} From 7326f871e58cd585809a83b58496f98b6d147e7c Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 20 Jan 2023 16:15:04 +0100 Subject: [PATCH 20/39] remove duplicate build step, update to nodejs 18, update to python 3.10 --- .github/workflows/build_multiplatform.yml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index d40fddbf..2b526484 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -100,9 +100,6 @@ jobs: name: libcodec2_${{ matrix.os }}_${{ matrix.platform.name }}_${{ matrix.architecture }}.${{ matrix.platform.file }} path: codec2/tempfiles/* - - - BUILD_ARM: # The host should always be linux runs-on: ubuntu-latest @@ -228,15 +225,15 @@ jobs: with: repository: DJ2LS/FreeDATA - - name: Set up Python 3.9 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.10 - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Create tnc/dist working-directory: tnc @@ -372,16 +369,6 @@ jobs: release: ${{ startsWith(github.ref, 'refs/tags/v') }} args: ${{ matrix.electron_parameters }} - - name: Build/release Electron app - uses: samuelmeuli/action-electron-builder@v1 - with: - package_root: "./gui/" - github_token: ${{ secrets.github_token }} - # If the commit is tagged with a version (e.g. "v1.0.0"), - # release the app after building - release: ${{ startsWith(github.ref, 'refs/tags/v') }} - args: ${{ matrix.electron_parameters }} - - name: Compress TNC uses: thedoctor0/zip-release@master with: From 440fda917abf2c4865a9a0cc6da0741141d6205d Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 20 Jan 2023 16:16:18 +0100 Subject: [PATCH 21/39] update to python 3.11 --- .github/workflows/build_multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 2b526484..58994ba9 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -225,10 +225,10 @@ jobs: with: repository: DJ2LS/FreeDATA - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: 3.11 - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 From 784aa9cf8275c3739274207cb9d6660efb4ae3b3 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 20 Jan 2023 16:17:55 +0100 Subject: [PATCH 22/39] added python 3.12 to ctest --- .github/workflows/ctest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml index 77c916b8..c7732176 100644 --- a/.github/workflows/ctest.yml +++ b/.github/workflows/ctest.yml @@ -21,6 +21,7 @@ jobs: - python-version: "3.9" - python-version: "3.10" - python-version: "3.11" + - python-version: "3.12" steps: - uses: actions/checkout@v3 From 059d23fa31410f0d100ff28e5b504d052d7b292e Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 20 Jan 2023 16:33:18 +0100 Subject: [PATCH 23/39] added python 3.12 to ctest --- .github/workflows/ctest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml index c7732176..9512c91f 100644 --- a/.github/workflows/ctest.yml +++ b/.github/workflows/ctest.yml @@ -21,7 +21,7 @@ jobs: - python-version: "3.9" - python-version: "3.10" - python-version: "3.11" - - python-version: "3.12" + - python-version: "3.12-dev" steps: - uses: actions/checkout@v3 From 8e9b9c91992bab2cd123c8beffc4fbc397686155 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 20 Jan 2023 20:16:19 +0100 Subject: [PATCH 24/39] outcommented python 3.12 as its not supported by nuitka yet --- .github/workflows/ctest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml index 9512c91f..44799a6f 100644 --- a/.github/workflows/ctest.yml +++ b/.github/workflows/ctest.yml @@ -21,7 +21,7 @@ jobs: - python-version: "3.9" - python-version: "3.10" - python-version: "3.11" - - python-version: "3.12-dev" + #- python-version: "3.12-dev" steps: - uses: actions/checkout@v3 From 21c98a83663bf13e1212c4a26fe3880c910545c8 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 20 Jan 2023 20:36:25 +0100 Subject: [PATCH 25/39] version update which should now work --- .github/workflows/build_multiplatform.yml | 4 ++-- .github/workflows/ctest.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 58994ba9..2b526484 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -225,10 +225,10 @@ jobs: with: repository: DJ2LS/FreeDATA - - name: Set up Python 3.11 + - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.11 + python-version: 3.10 - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml index 44799a6f..9512c91f 100644 --- a/.github/workflows/ctest.yml +++ b/.github/workflows/ctest.yml @@ -21,7 +21,7 @@ jobs: - python-version: "3.9" - python-version: "3.10" - python-version: "3.11" - #- python-version: "3.12-dev" + - python-version: "3.12-dev" steps: - uses: actions/checkout@v3 From da6dd1f0456e83458cc45423c0ec94199d0d3064 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Fri, 20 Jan 2023 20:56:10 +0100 Subject: [PATCH 26/39] version update which should now work --- .github/workflows/build_multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 2b526484..639c69dd 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -225,10 +225,10 @@ jobs: with: repository: DJ2LS/FreeDATA - - name: Set up Python 3.10 + - name: Set up Python 3.9 uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: 3.9 - name: Install Node.js, NPM and Yarn uses: actions/setup-node@v3 From 1d14f51854cc75e0331795cbb63d9b248416eadf Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 12:03:13 +0100 Subject: [PATCH 27/39] add osx_certs --- .github/workflows/build_multiplatform.yml | 6 ++++++ add-osx-cert.sh | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 add-osx-cert.sh diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 639c69dd..21825695 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -299,6 +299,12 @@ jobs: # with: # path: tnc/lib/codec2 + - name: Add MacOS certs + if: ${{startsWith(matrix.os, 'macos')}} + run: chmod +x add-osx-cert.sh && ./add-osx-cert.sh + env: + CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }} + CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} - name: Build binaries macOS if: ${{startsWith(matrix.os, 'macos')}} diff --git a/add-osx-cert.sh b/add-osx-cert.sh new file mode 100644 index 00000000..6da80041 --- /dev/null +++ b/add-osx-cert.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env sh + +KEY_CHAIN=build.keychain +CERTIFICATE_P12=certificate.p12 + +# Recreate the certificate from the secure environment variable +echo $CERTIFICATE_OSX_APPLICATION | base64 --decode > $CERTIFICATE_P12 + +#create a keychain +security create-keychain -p actions $KEY_CHAIN + +# Make the keychain the default so identities are found +security default-keychain -s $KEY_CHAIN + +# Unlock the keychain +security unlock-keychain -p actions $KEY_CHAIN + +security import $CERTIFICATE_P12 -k $KEY_CHAIN -P $CERTIFICATE_PASSWORD -T /usr/bin/codesign; + +security set-key-partition-list -S apple-tool:,apple: -s -k actions $KEY_CHAIN + +# remove certs +rm -fr *.p12 \ No newline at end of file From 2a8d1fd471c04dcdc616c7659058f88369b41359 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 12:05:12 +0100 Subject: [PATCH 28/39] add entitlements.plist --- gui/entitlements.plist | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 gui/entitlements.plist diff --git a/gui/entitlements.plist b/gui/entitlements.plist new file mode 100644 index 00000000..983f1099 --- /dev/null +++ b/gui/entitlements.plist @@ -0,0 +1,16 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.disable-library-validation + + com.apple.security.cs.disable-executable-page-protection + + com.apple.security.automation.apple-events + + + \ No newline at end of file From 30447595695d1d5be11b3042b614fe91e840b950 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 12:07:50 +0100 Subject: [PATCH 29/39] updated freedata.spec --- tnc/freedata.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tnc/freedata.spec b/tnc/freedata.spec index 743f7f48..feb115de 100644 --- a/tnc/freedata.spec +++ b/tnc/freedata.spec @@ -25,6 +25,7 @@ daemon_exe = EXE(daemon_pyz, [], exclude_binaries=True, name='freedata-daemon', + bundle_identifier='com.dj2ls.freedata-daemon', debug=False, bootloader_ignore_signals=False, strip=False, @@ -62,6 +63,7 @@ tnc_exe = EXE(tnc_pyz, [], exclude_binaries=True, name='freedata-tnc', + bundle_identifier='com.dj2ls.freedata-tnc', debug=False, bootloader_ignore_signals=False, strip=False, From 0e465d8bbba85b0f517aef03fe1ce33cc33fc70d Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 12:48:43 +0100 Subject: [PATCH 30/39] remove .git folder which prevents elecron from code signing --- .github/workflows/build_multiplatform.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 21825695..6d5fc46e 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -310,9 +310,11 @@ jobs: if: ${{startsWith(matrix.os, 'macos')}} working-directory: tnc run: | - #python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone daemon.py - #python3 -m nuitka --enable-plugin=numpy --assume-yes-for-downloads --standalone main.py + # remove .git folder from codec2 which causes app signing to fail + rm -r lib/codec2/.git + # now build tnc binaries pyinstaller -y freedata.spec + # and to some final cleanup cp -r -f dist/tnc/* dist/ rm -r dist/tnc From 47dd3fc23a77977b67b4ded886f048fcd59f3a37 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 13:01:35 +0100 Subject: [PATCH 31/39] remove .git folder recursively --- .github/workflows/build_multiplatform.yml | 27 +++++------------------ 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 6d5fc46e..6db71c35 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -279,26 +279,6 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt - - # - name: Install Pyaudio Windows - # if: ${{startsWith(matrix.os, 'windows')}} - # working-directory: tnc/lib/pyaudio/windows - # run: | - # pip install PyAudio-0.2.11-cp39-cp39-win_amd64.whl - - # - name: Display structure of downloaded files - # run: ls -R - - # - name: cleanup codec2 - # working-directory: tnc/lib/ - # run: | - # mkdir codec2 - # cd codec2 - - # - uses: actions/download-artifact@v3 - # with: - # path: tnc/lib/codec2 - - name: Add MacOS certs if: ${{startsWith(matrix.os, 'macos')}} run: chmod +x add-osx-cert.sh && ./add-osx-cert.sh @@ -311,7 +291,7 @@ jobs: working-directory: tnc run: | # remove .git folder from codec2 which causes app signing to fail - rm -r lib/codec2/.git + ls -R # now build tnc binaries pyinstaller -y freedata.spec # and to some final cleanup @@ -367,6 +347,11 @@ jobs: - name: LIST ALL FILES run: ls -R + - name: cleanup on macos before code signing + if: ${{startsWith(matrix.os, 'macos')}} + run: | + find . -type d -name .git -exec rm -r {} \; + - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 with: From d4a821ac3909d66b479ca65583e0d8d9d5c3d9a5 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 13:02:45 +0100 Subject: [PATCH 32/39] remove .git folder recursively --- .github/workflows/build_multiplatform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 6db71c35..7bc5c037 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -350,7 +350,8 @@ jobs: - name: cleanup on macos before code signing if: ${{startsWith(matrix.os, 'macos')}} run: | - find . -type d -name .git -exec rm -r {} \; + # find . -type d -name .git -exec rm -r {} \; + find . -type d -name .git -delete - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 From eb3c559ce2bb8bb185385eb598b1a06012c05acb Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 13:15:23 +0100 Subject: [PATCH 33/39] added popperjs dependency --- gui/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/package.json b/gui/package.json index a4b4dc52..9b076bf0 100644 --- a/gui/package.json +++ b/gui/package.json @@ -28,6 +28,7 @@ }, "homepage": "https://freedata.app", "dependencies": { + "@popperjs/core": "^2.11.6", "blob-util": "^2.0.2", "bootstrap": "^5.2.1", "bootstrap-icons": "^1.9.1", From 3d8fe47270b55f6f11bba35027a71cdc7ac010b2 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 13:18:16 +0100 Subject: [PATCH 34/39] another attempt remove all .git folders --- .github/workflows/build_multiplatform.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 7bc5c037..e58efbcc 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -290,8 +290,6 @@ jobs: if: ${{startsWith(matrix.os, 'macos')}} working-directory: tnc run: | - # remove .git folder from codec2 which causes app signing to fail - ls -R # now build tnc binaries pyinstaller -y freedata.spec # and to some final cleanup @@ -350,8 +348,9 @@ jobs: - name: cleanup on macos before code signing if: ${{startsWith(matrix.os, 'macos')}} run: | - # find . -type d -name .git -exec rm -r {} \; - find . -type d -name .git -delete + ls -l + find . -type d -name .git -exec rm -r {} \; + # find . -type d -name .git -delete - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 From 6dfc85e983d4c246b0ed971c6dac697559472b05 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 13:35:16 +0100 Subject: [PATCH 35/39] another attempt remove all .git folders --- .github/workflows/build_multiplatform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index e58efbcc..f5c2ad3e 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -349,8 +349,8 @@ jobs: if: ${{startsWith(matrix.os, 'macos')}} run: | ls -l - find . -type d -name .git -exec rm -r {} \; - # find . -type d -name .git -delete + # find . -type d -name .git -exec rm -r {} \; + find . -type d -o -name ".git" -delete - name: Build/release Electron app uses: samuelmeuli/action-electron-builder@v1 From 7a32e464f46ad8356854ff06cb7207703b0def25 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 14:14:20 +0100 Subject: [PATCH 36/39] another attempt remove all .git folders --- gui/package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gui/package.json b/gui/package.json index 9b076bf0..e3364122 100644 --- a/gui/package.json +++ b/gui/package.json @@ -28,6 +28,8 @@ }, "homepage": "https://freedata.app", "dependencies": { + "@electron/asar": "^3.2.3", + "@electron/osx-sign": "^1.0.4", "@popperjs/core": "^2.11.6", "blob-util": "^2.0.2", "bootstrap": "^5.2.1", @@ -42,7 +44,7 @@ "express-pouchdb": "^4.2.0", "mime": "^3.0.0", "pouchdb": "^7.3.0", - "pouchdb-browser": "^7.3.0", + "pouchdb-browser": "^7.3.0",e "pouchdb-express-router": "^0.0.11", "pouchdb-find": "^7.3.0", "pouchdb-replication": "^8.0.0", @@ -99,7 +101,8 @@ "from": "../tnc/dist/tnc/", "to": "tnc", "filter": [ - "**/*" + "**/*", + "!git/*" ] } ] From 7794f1afd23d67c803384a28caa011e223b63505 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 14:22:27 +0100 Subject: [PATCH 37/39] another attempt remove all .git folders --- gui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/package.json b/gui/package.json index e3364122..df953991 100644 --- a/gui/package.json +++ b/gui/package.json @@ -102,7 +102,7 @@ "to": "tnc", "filter": [ "**/*", - "!git/*" + "!.git/*" ] } ] From 44bf16f15e8c6e01125ffcc936a20c6c7ed16375 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 14:22:45 +0100 Subject: [PATCH 38/39] another attempt remove all .git folders --- gui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/package.json b/gui/package.json index df953991..a5528b19 100644 --- a/gui/package.json +++ b/gui/package.json @@ -102,7 +102,7 @@ "to": "tnc", "filter": [ "**/*", - "!.git/*" + "!**/.git" ] } ] From caa0bb2aac7b048083de57725171c1ea6cd84dd8 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 14:34:02 +0100 Subject: [PATCH 39/39] fixed package.json --- gui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/package.json b/gui/package.json index a5528b19..1534ecbc 100644 --- a/gui/package.json +++ b/gui/package.json @@ -44,7 +44,7 @@ "express-pouchdb": "^4.2.0", "mime": "^3.0.0", "pouchdb": "^7.3.0", - "pouchdb-browser": "^7.3.0",e + "pouchdb-browser": "^7.3.0", "pouchdb-express-router": "^0.0.11", "pouchdb-find": "^7.3.0", "pouchdb-replication": "^8.0.0",