From 0a13f7b6bcfeef69aed86474f85ba06bfcc62051 Mon Sep 17 00:00:00 2001 From: razor950 Date: Wed, 6 Nov 2024 23:04:50 -0500 Subject: [PATCH 01/45] commit linux / macos and windows nightly workflows --- .github/workflows/linux-nightly.yml | 73 +++++++++++++++++++++++++++ .github/workflows/macos-nightly.yml | 68 +++++++++++++++++++++++++ .github/workflows/windows-nightly.yml | 61 ++++++++++++++++++++++ 3 files changed, 202 insertions(+) create mode 100644 .github/workflows/linux-nightly.yml create mode 100644 .github/workflows/macos-nightly.yml create mode 100644 .github/workflows/windows-nightly.yml diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml new file mode 100644 index 0000000..879e822 --- /dev/null +++ b/.github/workflows/linux-nightly.yml @@ -0,0 +1,73 @@ +name: Linux (x86) Nightly Build + +on: + schedule: + - cron: '0 0 * * *' # Runs at 00:00 UTC every day + workflow_dispatch: # Allows manual triggering + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + name: Build Linux Packages + runs-on: ubuntu-20.04 # Using 20.04 for broader compatibility + + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + cache: 'npm' + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Install Linux Dependencies + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev + + - name: Install Dependencies + run: | + npm install + + - name: Build Frontend + run: npm run build + + - name: Build AppImage (x86_64) + run: | + echo "Building AppImage for x86_64..." + npm run tauri build -- --target x86_64-unknown-linux-gnu --bundles appimage + + - name: Build Debian Package (x86_64) + run: | + echo "Building Debian package for x86_64..." + npm run tauri build -- --target x86_64-unknown-linux-gnu --bundles deb + + - name: Upload AppImage + uses: actions/upload-artifact@v4 + with: + name: linux-appimage + path: src-tauri/target/release/bundle/appimage/*.AppImage + + - name: Upload Debian Package + uses: actions/upload-artifact@v4 + with: + name: linux-deb + path: src-tauri/target/release/bundle/deb/*.deb + + - name: Create Release + if: github.event_name == 'schedule' # Only create release for scheduled builds + uses: softprops/action-gh-release@v1 + with: + name: Linux Nightly Build ${{ github.sha }} + tag_name: linux-nightly-${{ github.sha }} + files: | + src-tauri/target/release/bundle/appimage/*.AppImage + src-tauri/target/release/bundle/deb/*.deb + prerelease: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml new file mode 100644 index 0000000..f752186 --- /dev/null +++ b/.github/workflows/macos-nightly.yml @@ -0,0 +1,68 @@ +name: MacOS Nightly Build + +on: + workflow_dispatch: # Allows manual triggering + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + name: Build MacOS Apps + runs-on: macos-latest + + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + cache: 'npm' + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Install Dependencies + run: | + rustup target add x86_64-apple-darwin + rustup target add aarch64-apple-darwin + npm install + + - name: Build Frontend + run: npm run build + + - name: Build for Intel Mac + run: | + echo "Building for x86_64..." + npm run tauri build -- --target x86_64-apple-darwin --bundles dmg + + - name: Build for Apple Silicon + run: | + echo "Building for aarch64..." + npm run tauri build -- --target aarch64-apple-darwin --bundles dmg + + - name: Upload Intel Build + uses: actions/upload-artifact@v4 + with: + name: macos-intel-build + path: src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg + + - name: Upload Apple Silicon Build + uses: actions/upload-artifact@v4 + with: + name: macos-apple-silicon-build + path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg + + - name: Create Release + if: github.event_name == 'schedule' # Only create release for scheduled builds + uses: softprops/action-gh-release@v1 + with: + name: Nightly Build ${{ github.sha }} + tag_name: nightly-${{ github.sha }} + files: | + src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg + src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg + prerelease: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml new file mode 100644 index 0000000..49f5c5e --- /dev/null +++ b/.github/workflows/windows-nightly.yml @@ -0,0 +1,61 @@ +name: Windows Nightly Build + +on: + schedule: + - cron: '0 0 * * *' # Runs at 00:00 UTC every day + workflow_dispatch: # Allows manual triggering + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + name: Build Windows Executable + runs-on: windows-latest + + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + cache: 'npm' + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Install WebView2 + run: | + $WebView2InstallPath = "$env:TEMP\MicrosoftEdgeWebview2Setup.exe" + Invoke-WebRequest "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -OutFile $WebView2InstallPath + Start-Process -FilePath $WebView2InstallPath -Args "/silent /install" -Wait + + - name: Install Dependencies + run: | + npm install + + - name: Build Frontend + run: npm run build + + - name: Build Windows Executable + run: | + echo "Building Windows executable..." + npm run tauri build -- --target x86_64-pc-windows-msvc + + - name: Upload Executable + uses: actions/upload-artifact@v4 + with: + name: windows-exe + path: src-tauri/target/release/*.exe + + - name: Create Release + if: github.event_name == 'schedule' # Only create release for scheduled builds + uses: softprops/action-gh-release@v1 + with: + name: Windows Nightly Build ${{ github.sha }} + tag_name: windows-nightly-${{ github.sha }} + files: src-tauri/target/release/*.exe + prerelease: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From d8ee612247b3f746371902e4ec8ccaf4ffc94e2f Mon Sep 17 00:00:00 2001 From: razor950 Date: Wed, 6 Nov 2024 23:10:04 -0500 Subject: [PATCH 02/45] added missing dependencies --- .github/workflows/linux-nightly.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 879e822..9e64257 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -28,7 +28,14 @@ jobs: - name: Install Linux Dependencies run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev + sudo apt-get install -y \ + build-essential \ + libgtk-3-dev \ + libwebkit2gtk-4.0-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev \ + libglib2.0-dev \ + pkg-config - name: Install Dependencies run: | From 8004e2c66180dc955f35a381e66030b2b31827b0 Mon Sep 17 00:00:00 2001 From: razor950 Date: Wed, 6 Nov 2024 23:15:05 -0500 Subject: [PATCH 03/45] move to ubuntu-latest --- .github/workflows/linux-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 9e64257..1c30f7a 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -11,7 +11,7 @@ env: jobs: build: name: Build Linux Packages - runs-on: ubuntu-20.04 # Using 20.04 for broader compatibility + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 180215fb596adc7491f72b1959c0438242430e43 Mon Sep 17 00:00:00 2001 From: razor950 Date: Wed, 6 Nov 2024 23:20:09 -0500 Subject: [PATCH 04/45] added more missing dependencies --- .github/workflows/linux-nightly.yml | 6 ++++-- .github/workflows/macos-nightly.yml | 2 +- .github/workflows/windows-nightly.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 1c30f7a..ea10c90 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -1,4 +1,4 @@ -name: Linux (x86) Nightly Build +name: Linux (x86_64) Nightly Build on: schedule: @@ -30,12 +30,14 @@ jobs: sudo apt-get update sudo apt-get install -y \ build-essential \ + pkg-config \ libgtk-3-dev \ libwebkit2gtk-4.0-dev \ libayatana-appindicator3-dev \ librsvg2-dev \ libglib2.0-dev \ - pkg-config + libjavascriptcoregtk-4.0-dev \ + libsoup2.4-dev - name: Install Dependencies run: | diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index f752186..b6f53f1 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -1,4 +1,4 @@ -name: MacOS Nightly Build +name: MacOS (x86_64/arm) Nightly Build on: workflow_dispatch: # Allows manual triggering diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index 49f5c5e..ede7e73 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -1,4 +1,4 @@ -name: Windows Nightly Build +name: Windows (x86_64) Nightly Build on: schedule: From f8d7d32ca494f400462ebb677528e37a2ddbadba Mon Sep 17 00:00:00 2001 From: razor950 Date: Wed, 6 Nov 2024 23:24:13 -0500 Subject: [PATCH 05/45] wrong versions of depends --- .github/workflows/linux-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index ea10c90..3959c36 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -32,12 +32,12 @@ jobs: build-essential \ pkg-config \ libgtk-3-dev \ - libwebkit2gtk-4.0-dev \ libayatana-appindicator3-dev \ librsvg2-dev \ libglib2.0-dev \ libjavascriptcoregtk-4.0-dev \ - libsoup2.4-dev + libsoup-3.0-dev \ + libwebkit2gtk-4.1-dev - name: Install Dependencies run: | From 4e1dfd67ad6632eccf130868158a3a11e93263bc Mon Sep 17 00:00:00 2001 From: razor950 Date: Wed, 6 Nov 2024 23:35:30 -0500 Subject: [PATCH 06/45] updated workflow for linux --- .github/workflows/linux-nightly.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 3959c36..70243be 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -60,13 +60,13 @@ jobs: uses: actions/upload-artifact@v4 with: name: linux-appimage - path: src-tauri/target/release/bundle/appimage/*.AppImage + path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage - name: Upload Debian Package uses: actions/upload-artifact@v4 with: name: linux-deb - path: src-tauri/target/release/bundle/deb/*.deb + path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb - name: Create Release if: github.event_name == 'schedule' # Only create release for scheduled builds @@ -75,8 +75,8 @@ jobs: name: Linux Nightly Build ${{ github.sha }} tag_name: linux-nightly-${{ github.sha }} files: | - src-tauri/target/release/bundle/appimage/*.AppImage - src-tauri/target/release/bundle/deb/*.deb + src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage + src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb prerelease: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 529aa2ed4d5377aab602a8277a487a1a271755ab Mon Sep 17 00:00:00 2001 From: razor950 Date: Wed, 6 Nov 2024 23:51:16 -0500 Subject: [PATCH 07/45] fixed windows build --- .github/workflows/windows-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index ede7e73..c1c5847 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -41,7 +41,7 @@ jobs: - name: Build Windows Executable run: | echo "Building Windows executable..." - npm run tauri build -- --target x86_64-pc-windows-msvc + npm run tauri build - name: Upload Executable uses: actions/upload-artifact@v4 From 143d071d1ba61c966cfe814b79e20d1f4aad9915 Mon Sep 17 00:00:00 2001 From: razor950 Date: Thu, 7 Nov 2024 00:18:59 -0500 Subject: [PATCH 08/45] force manual trigger for now --- .github/workflows/linux-nightly.yml | 2 -- .github/workflows/windows-nightly.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 70243be..3e0af38 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -1,8 +1,6 @@ name: Linux (x86_64) Nightly Build on: - schedule: - - cron: '0 0 * * *' # Runs at 00:00 UTC every day workflow_dispatch: # Allows manual triggering env: diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index c1c5847..e54d0e1 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -1,8 +1,6 @@ name: Windows (x86_64) Nightly Build on: - schedule: - - cron: '0 0 * * *' # Runs at 00:00 UTC every day workflow_dispatch: # Allows manual triggering env: From f15fbaeac55c122d1c365e4901fa401488e2e147 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 16:04:55 +0100 Subject: [PATCH 09/45] testing on local branch --- .github/workflows/linux-nightly.yml | 5 ++++- .github/workflows/macos-nightly.yml | 5 ++++- .github/workflows/windows-nightly.yml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 3e0af38..30dbe2c 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -1,7 +1,10 @@ name: Linux (x86_64) Nightly Build on: - workflow_dispatch: # Allows manual triggering + push: + branches: + - pr-29 + workflow_dispatch: # Allows manual triggering env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index b6f53f1..4a14dae 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -1,7 +1,10 @@ name: MacOS (x86_64/arm) Nightly Build on: - workflow_dispatch: # Allows manual triggering + push: + branches: + - pr-29 + workflow_dispatch: # Allows manual triggering env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index e54d0e1..8ddb7a9 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -1,7 +1,10 @@ name: Windows (x86_64) Nightly Build on: - workflow_dispatch: # Allows manual triggering + push: + branches: + - pr-29 + workflow_dispatch: # Allows manual triggering env: CARGO_TERM_COLOR: always From 6380f21f7d2e1e5f74fcadf83d5b581ab1955d0b Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 16:31:43 +0100 Subject: [PATCH 10/45] added keychain setup --- .github/workflows/macos-nightly.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index 4a14dae..dd813d5 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -32,6 +32,17 @@ jobs: rustup target add aarch64-apple-darwin npm install + - name: Set up keychain + run: | + security create-keychain -p "" build.keychain + security default-keychain -s build.keychain + security unlock-keychain -p "" build.keychain + security import <(echo "$MACOS_CERTIFICATE" | base64 --decode) -k build.keychain -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign + security set-key-partition-list -S apple-tool:,apple: -s -k "" build.keychain + env: + MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }} + MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }} + - name: Build Frontend run: npm run build From 267d1334f9d5aec5ce0f876843a4f4153a0b7886 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 16:36:02 +0100 Subject: [PATCH 11/45] added keychain setup --- .github/workflows/macos-nightly.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index dd813d5..81ee003 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -37,7 +37,8 @@ jobs: security create-keychain -p "" build.keychain security default-keychain -s build.keychain security unlock-keychain -p "" build.keychain - security import <(echo "$MACOS_CERTIFICATE" | base64 --decode) -k build.keychain -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign + echo "$MACOS_CERTIFICATE" | base64 --decode > /tmp/certificate.p12 + security import /tmp/certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PASSWORD" -T /usr/bin/codesign security set-key-partition-list -S apple-tool:,apple: -s -k "" build.keychain env: MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }} From e59898921fee561808281f719bd186df09591e9e Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 16:46:07 +0100 Subject: [PATCH 12/45] final --- .github/workflows/linux-nightly.yml | 3 --- .github/workflows/macos-nightly.yml | 3 --- .github/workflows/windows-nightly.yml | 3 --- 3 files changed, 9 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 30dbe2c..cb5ae14 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -1,9 +1,6 @@ name: Linux (x86_64) Nightly Build on: - push: - branches: - - pr-29 workflow_dispatch: # Allows manual triggering env: diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index 81ee003..2381489 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -1,9 +1,6 @@ name: MacOS (x86_64/arm) Nightly Build on: - push: - branches: - - pr-29 workflow_dispatch: # Allows manual triggering env: diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index 8ddb7a9..c2dba75 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -1,9 +1,6 @@ name: Windows (x86_64) Nightly Build on: - push: - branches: - - pr-29 workflow_dispatch: # Allows manual triggering env: From 8f2e94e03dabb58427139df9d4f6af5011751c8f Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 16:59:21 +0100 Subject: [PATCH 13/45] cross compilation for both linux architectures --- .github/workflows/linux-nightly.yml | 37 ++++++++++++++++++----------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index cb5ae14..b5e5a6c 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -1,4 +1,4 @@ -name: Linux (x86_64) Nightly Build +name: Linux (x86_64, aarch64) Nightly Build on: workflow_dispatch: # Allows manual triggering @@ -10,6 +10,9 @@ jobs: build: name: Build Linux Packages runs-on: ubuntu-latest + strategy: + matrix: + target: [x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu] steps: - uses: actions/checkout@v4 @@ -23,6 +26,12 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable + - name: Install Cross-Compilation Tools + if: matrix.target == 'aarch64-unknown-linux-gnu' + run: | + sudo apt-get update + sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + - name: Install Linux Dependencies run: | sudo apt-get update @@ -44,37 +53,37 @@ jobs: - name: Build Frontend run: npm run build - - name: Build AppImage (x86_64) + - name: Build AppImage (${{ matrix.target }}) run: | - echo "Building AppImage for x86_64..." - npm run tauri build -- --target x86_64-unknown-linux-gnu --bundles appimage + echo "Building AppImage for ${{ matrix.target }}..." + npm run tauri build -- --target ${{ matrix.target }} --bundles appimage - - name: Build Debian Package (x86_64) + - name: Build Debian Package (${{ matrix.target }}) run: | - echo "Building Debian package for x86_64..." - npm run tauri build -- --target x86_64-unknown-linux-gnu --bundles deb + echo "Building Debian package for ${{ matrix.target }}..." + npm run tauri build -- --target ${{ matrix.target }} --bundles deb - name: Upload AppImage uses: actions/upload-artifact@v4 with: - name: linux-appimage - path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage + name: linux-appimage-${{ matrix.target }} + path: src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage - name: Upload Debian Package uses: actions/upload-artifact@v4 with: - name: linux-deb - path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb + name: linux-deb-${{ matrix.target }} + path: src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb - name: Create Release - if: github.event_name == 'schedule' # Only create release for scheduled builds + if: github.event_name == 'schedule' uses: softprops/action-gh-release@v1 with: name: Linux Nightly Build ${{ github.sha }} tag_name: linux-nightly-${{ github.sha }} files: | - src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage - src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb + src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage + src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb prerelease: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 17b09e3633da5dcb133fa755122d9135af348502 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:03:25 +0100 Subject: [PATCH 14/45] install target architecture --- .github/workflows/linux-nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index b5e5a6c..0496770 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -26,6 +26,9 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@stable + - name: Add Target + run: rustup target add ${{ matrix.target }} + - name: Install Cross-Compilation Tools if: matrix.target == 'aarch64-unknown-linux-gnu' run: | From 30ddc36e1a913aa1975ab3217f75c97546e1ab57 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:08:01 +0100 Subject: [PATCH 15/45] install Cross-Compilation Tools --- .github/workflows/linux-nightly.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 0496770..9104768 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -34,6 +34,24 @@ jobs: run: | sudo apt-get update sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + sudo apt-get install -y pkg-config-aarch64-linux-gnu + # Install ARM64 versions of GTK and related dependencies + sudo apt-get install -y \ + libgtk-3-dev:arm64 \ + libayatana-appindicator3-dev:arm64 \ + librsvg2-dev:arm64 \ + libglib2.0-dev:arm64 \ + libjavascriptcoregtk-4.0-dev:arm64 \ + libsoup-3.0-dev:arm64 \ + libwebkit2gtk-4.1-dev:arm64 + + - name: Configure Cross-Compilation Environment + if: matrix.target == 'aarch64-unknown-linux-gnu' + run: | + echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV + echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV + echo "PKG_CONFIG=pkg-config-aarch64-linux-gnu" >> $GITHUB_ENV - name: Install Linux Dependencies run: | From 17ea10158ee5b2135cfff6cc9fbb2037fbaca4a0 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:12:50 +0100 Subject: [PATCH 16/45] fixing linux workflows --- .github/workflows/linux-nightly.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 9104768..aa86452 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -34,7 +34,8 @@ jobs: run: | sudo apt-get update sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - sudo apt-get install -y pkg-config-aarch64-linux-gnu + # Remove the non-existent package + # sudo apt-get install -y pkg-config-aarch64-linux-gnu # Install ARM64 versions of GTK and related dependencies sudo apt-get install -y \ libgtk-3-dev:arm64 \ @@ -51,7 +52,8 @@ jobs: echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV - echo "PKG_CONFIG=pkg-config-aarch64-linux-gnu" >> $GITHUB_ENV + # Use regular pkg-config instead of the arm64-specific one + echo "PKG_CONFIG=pkg-config" >> $GITHUB_ENV - name: Install Linux Dependencies run: | From a6f6c8b6eeac66a08ac7ce7dd322023661e1a32a Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:16:04 +0100 Subject: [PATCH 17/45] fixing linux workflows --- .github/workflows/linux-nightly.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index aa86452..d9969b5 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -32,10 +32,9 @@ jobs: - name: Install Cross-Compilation Tools if: matrix.target == 'aarch64-unknown-linux-gnu' run: | + sudo dpkg --add-architecture arm64 sudo apt-get update sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - # Remove the non-existent package - # sudo apt-get install -y pkg-config-aarch64-linux-gnu # Install ARM64 versions of GTK and related dependencies sudo apt-get install -y \ libgtk-3-dev:arm64 \ From 4dead5feed3b638be6e1821aab4bc9ed59f8469e Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:18:53 +0100 Subject: [PATCH 18/45] fixing linux workflows --- .github/workflows/linux-nightly.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index d9969b5..76a754c 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -33,6 +33,12 @@ jobs: if: matrix.target == 'aarch64-unknown-linux-gnu' run: | sudo dpkg --add-architecture arm64 + # Add ARM64 repositories + sudo tee /etc/apt/sources.list.d/arm64.list << EOF + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted + EOF sudo apt-get update sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu # Install ARM64 versions of GTK and related dependencies From 8e4a620e614873d746bd4509ee050e5b17fe7103 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:21:20 +0100 Subject: [PATCH 19/45] fixing linux workflows --- .github/workflows/linux-nightly.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml index 76a754c..2085555 100644 --- a/.github/workflows/linux-nightly.yml +++ b/.github/workflows/linux-nightly.yml @@ -33,11 +33,19 @@ jobs: if: matrix.target == 'aarch64-unknown-linux-gnu' run: | sudo dpkg --add-architecture arm64 + # Remove existing sources to prevent 404 errors + sudo rm -f /etc/apt/sources.list.d/*.list # Add ARM64 repositories sudo tee /etc/apt/sources.list.d/arm64.list << EOF - deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted - deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted - deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse + EOF + # Add amd64 repositories + sudo tee /etc/apt/sources.list.d/amd64.list << EOF + deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main restricted universe multiverse + deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse + deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main restricted universe multiverse EOF sudo apt-get update sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu From d2283a4deff778c70d7a2cbd6976fbed4a180207 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:29:27 +0100 Subject: [PATCH 20/45] separating linux workflows --- .github/workflows/linux-aarch64-nightly.yml | 85 +++++++++++++ .github/workflows/linux-nightly.yml | 125 -------------------- .github/workflows/linux-x86_64-nightly.yml | 80 +++++++++++++ 3 files changed, 165 insertions(+), 125 deletions(-) create mode 100644 .github/workflows/linux-aarch64-nightly.yml delete mode 100644 .github/workflows/linux-nightly.yml create mode 100644 .github/workflows/linux-x86_64-nightly.yml diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml new file mode 100644 index 0000000..bc7e9a0 --- /dev/null +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -0,0 +1,85 @@ +name: Linux (aarch64) Nightly Build + +on: + workflow_dispatch: # Allows manual triggering + schedule: + - cron: '0 0 * * *' # Run daily at midnight UTC + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + name: Build Linux aarch64 Packages + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + cache: 'npm' + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + with: + targets: aarch64-unknown-linux-gnu + + - name: Install Linux Dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + build-essential \ + pkg-config \ + gcc-aarch64-linux-gnu \ + g++-aarch64-linux-gnu \ + libgtk-3-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev \ + libglib2.0-dev \ + libjavascriptcoregtk-4.0-dev \ + libsoup-3.0-dev \ + libwebkit2gtk-4.1-dev + + - name: Install Dependencies + run: npm install + + - name: Build Frontend + run: npm run build + + - name: Build AppImage + run: | + echo "Building AppImage for aarch64..." + npm run tauri build -- --target aarch64-unknown-linux-gnu --bundles appimage + + - name: Build Debian Package + run: | + echo "Building Debian package for aarch64..." + npm run tauri build -- --target aarch64-unknown-linux-gnu --bundles deb + + - name: Upload AppImage + uses: actions/upload-artifact@v4 + with: + name: linux-appimage-aarch64 + path: src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/appimage/*.AppImage + + - name: Upload Debian Package + uses: actions/upload-artifact@v4 + with: + name: linux-deb-aarch64 + path: src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb + + - name: Create Release + if: github.event_name == 'schedule' # Only create release for scheduled builds + uses: softprops/action-gh-release@v1 + with: + name: Linux ARM64 Nightly Build ${{ github.sha }} + tag_name: linux-arm64-nightly-${{ github.sha }} + files: | + src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/appimage/*.AppImage + src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb + prerelease: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/linux-nightly.yml b/.github/workflows/linux-nightly.yml deleted file mode 100644 index 2085555..0000000 --- a/.github/workflows/linux-nightly.yml +++ /dev/null @@ -1,125 +0,0 @@ -name: Linux (x86_64, aarch64) Nightly Build - -on: - workflow_dispatch: # Allows manual triggering - -env: - CARGO_TERM_COLOR: always - -jobs: - build: - name: Build Linux Packages - runs-on: ubuntu-latest - strategy: - matrix: - target: [x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu] - - steps: - - uses: actions/checkout@v4 - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: 'lts/*' - cache: 'npm' - - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - - - name: Add Target - run: rustup target add ${{ matrix.target }} - - - name: Install Cross-Compilation Tools - if: matrix.target == 'aarch64-unknown-linux-gnu' - run: | - sudo dpkg --add-architecture arm64 - # Remove existing sources to prevent 404 errors - sudo rm -f /etc/apt/sources.list.d/*.list - # Add ARM64 repositories - sudo tee /etc/apt/sources.list.d/arm64.list << EOF - deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse - deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse - deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse - EOF - # Add amd64 repositories - sudo tee /etc/apt/sources.list.d/amd64.list << EOF - deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main restricted universe multiverse - deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse - deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main restricted universe multiverse - EOF - sudo apt-get update - sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - # Install ARM64 versions of GTK and related dependencies - sudo apt-get install -y \ - libgtk-3-dev:arm64 \ - libayatana-appindicator3-dev:arm64 \ - librsvg2-dev:arm64 \ - libglib2.0-dev:arm64 \ - libjavascriptcoregtk-4.0-dev:arm64 \ - libsoup-3.0-dev:arm64 \ - libwebkit2gtk-4.1-dev:arm64 - - - name: Configure Cross-Compilation Environment - if: matrix.target == 'aarch64-unknown-linux-gnu' - run: | - echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV - echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV - # Use regular pkg-config instead of the arm64-specific one - echo "PKG_CONFIG=pkg-config" >> $GITHUB_ENV - - - name: Install Linux Dependencies - run: | - sudo apt-get update - sudo apt-get install -y \ - build-essential \ - pkg-config \ - libgtk-3-dev \ - libayatana-appindicator3-dev \ - librsvg2-dev \ - libglib2.0-dev \ - libjavascriptcoregtk-4.0-dev \ - libsoup-3.0-dev \ - libwebkit2gtk-4.1-dev - - - name: Install Dependencies - run: | - npm install - - - name: Build Frontend - run: npm run build - - - name: Build AppImage (${{ matrix.target }}) - run: | - echo "Building AppImage for ${{ matrix.target }}..." - npm run tauri build -- --target ${{ matrix.target }} --bundles appimage - - - name: Build Debian Package (${{ matrix.target }}) - run: | - echo "Building Debian package for ${{ matrix.target }}..." - npm run tauri build -- --target ${{ matrix.target }} --bundles deb - - - name: Upload AppImage - uses: actions/upload-artifact@v4 - with: - name: linux-appimage-${{ matrix.target }} - path: src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage - - - name: Upload Debian Package - uses: actions/upload-artifact@v4 - with: - name: linux-deb-${{ matrix.target }} - path: src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb - - - name: Create Release - if: github.event_name == 'schedule' - uses: softprops/action-gh-release@v1 - with: - name: Linux Nightly Build ${{ github.sha }} - tag_name: linux-nightly-${{ github.sha }} - files: | - src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage - src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb - prerelease: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/linux-x86_64-nightly.yml b/.github/workflows/linux-x86_64-nightly.yml new file mode 100644 index 0000000..cb5ae14 --- /dev/null +++ b/.github/workflows/linux-x86_64-nightly.yml @@ -0,0 +1,80 @@ +name: Linux (x86_64) Nightly Build + +on: + workflow_dispatch: # Allows manual triggering + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + name: Build Linux Packages + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + cache: 'npm' + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Install Linux Dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + build-essential \ + pkg-config \ + libgtk-3-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev \ + libglib2.0-dev \ + libjavascriptcoregtk-4.0-dev \ + libsoup-3.0-dev \ + libwebkit2gtk-4.1-dev + + - name: Install Dependencies + run: | + npm install + + - name: Build Frontend + run: npm run build + + - name: Build AppImage (x86_64) + run: | + echo "Building AppImage for x86_64..." + npm run tauri build -- --target x86_64-unknown-linux-gnu --bundles appimage + + - name: Build Debian Package (x86_64) + run: | + echo "Building Debian package for x86_64..." + npm run tauri build -- --target x86_64-unknown-linux-gnu --bundles deb + + - name: Upload AppImage + uses: actions/upload-artifact@v4 + with: + name: linux-appimage + path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage + + - name: Upload Debian Package + uses: actions/upload-artifact@v4 + with: + name: linux-deb + path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb + + - name: Create Release + if: github.event_name == 'schedule' # Only create release for scheduled builds + uses: softprops/action-gh-release@v1 + with: + name: Linux Nightly Build ${{ github.sha }} + tag_name: linux-nightly-${{ github.sha }} + files: | + src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage + src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb + prerelease: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 7b0206db71a22b87736ffd1521d89a6ce5844a67 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:35:34 +0100 Subject: [PATCH 21/45] fixing pkg-config in aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 25 +++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index bc7e9a0..fed25ec 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -7,6 +7,9 @@ on: env: CARGO_TERM_COLOR: always + PKG_CONFIG_ALLOW_CROSS: 1 + PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig + PKG_CONFIG: /usr/bin/aarch64-linux-gnu-pkg-config jobs: build: @@ -29,19 +32,27 @@ jobs: - name: Install Linux Dependencies run: | + sudo dpkg --add-architecture arm64 sudo apt-get update sudo apt-get install -y \ build-essential \ pkg-config \ + pkg-config-aarch64-linux-gnu \ gcc-aarch64-linux-gnu \ g++-aarch64-linux-gnu \ - libgtk-3-dev \ - libayatana-appindicator3-dev \ - librsvg2-dev \ - libglib2.0-dev \ - libjavascriptcoregtk-4.0-dev \ - libsoup-3.0-dev \ - libwebkit2gtk-4.1-dev + libgtk-3-dev:arm64 \ + libayatana-appindicator3-dev:arm64 \ + librsvg2-dev:arm64 \ + libglib2.0-dev:arm64 \ + libjavascriptcoregtk-4.0-dev:arm64 \ + libsoup-3.0-dev:arm64 \ + libwebkit2gtk-4.1-dev:arm64 + + - name: Configure Cross-Compilation + run: | + echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - name: Install Dependencies run: npm install From cb93649195fb800e68904e1dcf5e22cddb42a0b6 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:44:07 +0100 Subject: [PATCH 22/45] fixing pkg-config in aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index fed25ec..b3af010 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -56,7 +56,13 @@ jobs: - name: Install Dependencies run: npm install - + + - name: Configure pkg-config for Cross-Compilation + run: | + sudo apt-get install -y pkg-config-aarch64-linux-gnu + echo "PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV + - name: Build Frontend run: npm run build From 34224a12db84f17915ab57899d72acb8c4da7026 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:50:44 +0100 Subject: [PATCH 23/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index b3af010..4d1bbb4 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -30,10 +30,19 @@ jobs: with: targets: aarch64-unknown-linux-gnu - - name: Install Linux Dependencies + - name: Configure ARM64 build environment run: | sudo dpkg --add-architecture arm64 + # Remove existing sources to prevent 404 errors + sudo rm -f /etc/apt/sources.list.d/*.list + # Add ARM64 repositories from ports.ubuntu.com + sudo tee /etc/apt/sources.list.d/arm64.list << EOF + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse + deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse + EOF sudo apt-get update + # Install required packages including cross-compilation tools sudo apt-get install -y \ build-essential \ pkg-config \ @@ -47,10 +56,7 @@ jobs: libjavascriptcoregtk-4.0-dev:arm64 \ libsoup-3.0-dev:arm64 \ libwebkit2gtk-4.1-dev:arm64 - - - name: Configure Cross-Compilation - run: | - echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV + # Configure pkg-config for cross-compilation echo "PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV From a8097db8e27f2c0bfaf92b0f9c3066d6406582fd Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:54:43 +0100 Subject: [PATCH 24/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 4d1bbb4..80a4dd2 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -30,17 +30,15 @@ jobs: with: targets: aarch64-unknown-linux-gnu - - name: Configure ARM64 build environment + - name: Configure ARM64 repositories run: | sudo dpkg --add-architecture arm64 - # Remove existing sources to prevent 404 errors - sudo rm -f /etc/apt/sources.list.d/*.list - # Add ARM64 repositories from ports.ubuntu.com sudo tee /etc/apt/sources.list.d/arm64.list << EOF deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse EOF + sudo rm -f /etc/apt/sources.list.d/security.list sudo apt-get update # Install required packages including cross-compilation tools sudo apt-get install -y \ From b0dc9b3d04d69d92f0927467e909bfd6f20890a3 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:58:07 +0100 Subject: [PATCH 25/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 80a4dd2..c8cfa67 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -33,12 +33,18 @@ jobs: - name: Configure ARM64 repositories run: | sudo dpkg --add-architecture arm64 - sudo tee /etc/apt/sources.list.d/arm64.list << EOF + # Remove all existing sources + sudo rm -rf /etc/apt/sources.list.d/* + sudo truncate -s 0 /etc/apt/sources.list + # Add only ports.ubuntu.com repository + sudo tee /etc/apt/sources.list << EOF deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse + deb [arch=amd64] http://azure.archive.ubuntu.com/ubuntu jammy main restricted universe multiverse + deb [arch=amd64] http://azure.archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse + deb [arch=amd64] http://azure.archive.ubuntu.com/ubuntu jammy-security main restricted universe multiverse EOF - sudo rm -f /etc/apt/sources.list.d/security.list sudo apt-get update # Install required packages including cross-compilation tools sudo apt-get install -y \ From 0cbe3a4210936d42f102c743b4bb80202213c1f3 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 17:59:29 +0100 Subject: [PATCH 26/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index c8cfa67..7fae920 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -50,7 +50,7 @@ jobs: sudo apt-get install -y \ build-essential \ pkg-config \ - pkg-config-aarch64-linux-gnu \ + crossbuild-essential-arm64 \ gcc-aarch64-linux-gnu \ g++-aarch64-linux-gnu \ libgtk-3-dev:arm64 \ From a215ef955ab5c2d3aff6df1403e128f53601664d Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 18:06:01 +0100 Subject: [PATCH 27/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 7fae920..5e9d175 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -67,11 +67,18 @@ jobs: - name: Install Dependencies run: npm install - - name: Configure pkg-config for Cross-Compilation + - name: Setup pkg-config for ARM64 run: | - sudo apt-get install -y pkg-config-aarch64-linux-gnu + sudo apt-get install -y crossbuild-essential-arm64 pkg-config + # Create the pkg-config wrapper for aarch64 + sudo tee /usr/bin/aarch64-linux-gnu-pkg-config << 'EOF' + #!/bin/sh + export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig + exec pkg-config "$@" + EOF + sudo chmod +x /usr/bin/aarch64-linux-gnu-pkg-config echo "PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV - echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - name: Build Frontend run: npm run build From 42f8cf1d78894c6cdb965117c14af4bf1c119223 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 18:31:31 +0100 Subject: [PATCH 28/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 5e9d175..543c91d 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -59,7 +59,10 @@ jobs: libglib2.0-dev:arm64 \ libjavascriptcoregtk-4.0-dev:arm64 \ libsoup-3.0-dev:arm64 \ - libwebkit2gtk-4.1-dev:arm64 + libwebkit2gtk-4.1-dev:arm64 \ + libssl-dev:arm64 \ + libssl-dev \ + openssl:arm64 # Configure pkg-config for cross-compilation echo "PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV From 978efa8dcf9b516d23e2955cbd848d6397ad7f59 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 18:43:56 +0100 Subject: [PATCH 29/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 26 +++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 543c91d..4a575d4 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -70,18 +70,36 @@ jobs: - name: Install Dependencies run: npm install - - name: Setup pkg-config for ARM64 + - name: Setup cross-compilation environment run: | - sudo apt-get install -y crossbuild-essential-arm64 pkg-config - # Create the pkg-config wrapper for aarch64 + sudo apt-get install -y \ + crossbuild-essential-arm64 \ + pkg-config \ + libssl-dev:arm64 \ + libssl-dev \ + openssl:arm64 + + # Create .cargo/config + mkdir -p .cargo + cat > .cargo/config << EOF + [target.aarch64-unknown-linux-gnu] + linker = "aarch64-linux-gnu-gcc" + ar = "aarch64-linux-gnu-ar" + EOF + + # Setup pkg-config sudo tee /usr/bin/aarch64-linux-gnu-pkg-config << 'EOF' #!/bin/sh export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig exec pkg-config "$@" EOF sudo chmod +x /usr/bin/aarch64-linux-gnu-pkg-config + + # Set environment variables echo "PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV - echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV + echo "OPENSSL_DIR=/usr/include/aarch64-linux-gnu" >> $GITHUB_ENV + echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - name: Build Frontend run: npm run build From c19f927f60b81c60002405f4b426c93959bea956 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 18:53:09 +0100 Subject: [PATCH 30/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 4a575d4..ecaf9c3 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -79,14 +79,6 @@ jobs: libssl-dev \ openssl:arm64 - # Create .cargo/config - mkdir -p .cargo - cat > .cargo/config << EOF - [target.aarch64-unknown-linux-gnu] - linker = "aarch64-linux-gnu-gcc" - ar = "aarch64-linux-gnu-ar" - EOF - # Setup pkg-config sudo tee /usr/bin/aarch64-linux-gnu-pkg-config << 'EOF' #!/bin/sh @@ -95,10 +87,20 @@ jobs: EOF sudo chmod +x /usr/bin/aarch64-linux-gnu-pkg-config + # Create .cargo/config + mkdir -p .cargo + cat > .cargo/config << EOF + [target.aarch64-unknown-linux-gnu] + linker = "aarch64-linux-gnu-gcc" + ar = "aarch64-linux-gnu-ar" + EOF + # Set environment variables echo "PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - echo "OPENSSL_DIR=/usr/include/aarch64-linux-gnu" >> $GITHUB_ENV + echo "OPENSSL_DIR=/usr" >> $GITHUB_ENV + echo "OPENSSL_INCLUDE_DIR=/usr/include/aarch64-linux-gnu" >> $GITHUB_ENV + echo "OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - name: Build Frontend From 01d928655452471509b56b25b1ff754b0100e28d Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 19:02:12 +0100 Subject: [PATCH 31/45] fixing aarch64 workflow --- .github/workflows/linux-aarch64-nightly.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index ecaf9c3..1ad969d 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -77,7 +77,11 @@ jobs: pkg-config \ libssl-dev:arm64 \ libssl-dev \ - openssl:arm64 + openssl:arm64 \ + file \ + desktop-file-utils \ + libfuse2 \ + qemu-user-static # Setup pkg-config sudo tee /usr/bin/aarch64-linux-gnu-pkg-config << 'EOF' @@ -86,7 +90,7 @@ jobs: exec pkg-config "$@" EOF sudo chmod +x /usr/bin/aarch64-linux-gnu-pkg-config - + # Create .cargo/config mkdir -p .cargo cat > .cargo/config << EOF @@ -95,6 +99,11 @@ jobs: ar = "aarch64-linux-gnu-ar" EOF + # Download and setup appimagetool for ARM64 + wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-aarch64.AppImage + chmod +x appimagetool-aarch64.AppImage + sudo mv appimagetool-aarch64.AppImage /usr/local/bin/appimagetool + # Set environment variables echo "PKG_CONFIG=/usr/bin/aarch64-linux-gnu-pkg-config" >> $GITHUB_ENV echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV @@ -102,6 +111,7 @@ jobs: echo "OPENSSL_INCLUDE_DIR=/usr/include/aarch64-linux-gnu" >> $GITHUB_ENV echo "OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV + echo "APPIMAGE_EXTRACT_AND_RUN=1" >> $GITHUB_ENV - name: Build Frontend run: npm run build From 65c935a4b9c02ccaecc917a7f571c74d04bef9b3 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 19:55:09 +0100 Subject: [PATCH 32/45] test release workflow --- .github/workflows/test-release.yml | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/test-release.yml diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml new file mode 100644 index 0000000..82983af --- /dev/null +++ b/.github/workflows/test-release.yml @@ -0,0 +1,38 @@ +name: Test Release Build + +on: + workflow_dispatch: # Manual trigger + +jobs: + trigger-builds: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Trigger MacOS Build + uses: benc-uk/workflow-dispatch@v1 + with: + workflow: MacOS Nightly Build + token: ${{ secrets.GITHUB_TOKEN }} + inputs: '{"event_name": "schedule"}' + + - name: Trigger Windows Build + uses: benc-uk/workflow-dispatch@v1 + with: + workflow: Windows Nightly Build + token: ${{ secrets.GITHUB_TOKEN }} + inputs: '{"event_name": "schedule"}' + + - name: Trigger Linux x86_64 Build + uses: benc-uk/workflow-dispatch@v1 + with: + workflow: Linux x86_64 Nightly Build + token: ${{ secrets.GITHUB_TOKEN }} + inputs: '{"event_name": "schedule"}' + + - name: Trigger Linux ARM64 Build + uses: benc-uk/workflow-dispatch@v1 + with: + workflow: Linux aarch64 Nightly Build + token: ${{ secrets.GITHUB_TOKEN }} + inputs: '{"event_name": "schedule"}' \ No newline at end of file From 9060fc8e5b19b45dc4224b3e56459078bbc8a58d Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 20:00:41 +0100 Subject: [PATCH 33/45] test release workflow --- .github/workflows/macos-nightly.yml | 2 +- .github/workflows/test-release.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index 2381489..08daa8a 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -1,4 +1,4 @@ -name: MacOS (x86_64/arm) Nightly Build +name: MacOS (Intel/Apple Silicon) Nightly Build on: workflow_dispatch: # Allows manual triggering diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index 82983af..8fb3a72 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -12,27 +12,27 @@ jobs: - name: Trigger MacOS Build uses: benc-uk/workflow-dispatch@v1 with: - workflow: MacOS Nightly Build + workflow: macos-nightly.yml token: ${{ secrets.GITHUB_TOKEN }} inputs: '{"event_name": "schedule"}' - name: Trigger Windows Build uses: benc-uk/workflow-dispatch@v1 with: - workflow: Windows Nightly Build + workflow: windows-nightly.yml token: ${{ secrets.GITHUB_TOKEN }} inputs: '{"event_name": "schedule"}' - name: Trigger Linux x86_64 Build uses: benc-uk/workflow-dispatch@v1 with: - workflow: Linux x86_64 Nightly Build + workflow: linux-x86_64-nightly.yml token: ${{ secrets.GITHUB_TOKEN }} inputs: '{"event_name": "schedule"}' - name: Trigger Linux ARM64 Build uses: benc-uk/workflow-dispatch@v1 with: - workflow: Linux aarch64 Nightly Build + workflow: linux-aarch64-nightly.yml token: ${{ secrets.GITHUB_TOKEN }} inputs: '{"event_name": "schedule"}' \ No newline at end of file From fcb5cfb9eae3a2981f0c7810859fda7eb2e3e329 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 20:06:26 +0100 Subject: [PATCH 34/45] test release workflow --- .github/workflows/test-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index 8fb3a72..28ca0d6 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -13,26 +13,26 @@ jobs: uses: benc-uk/workflow-dispatch@v1 with: workflow: macos-nightly.yml - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.PAT_TOKEN }} inputs: '{"event_name": "schedule"}' - name: Trigger Windows Build uses: benc-uk/workflow-dispatch@v1 with: workflow: windows-nightly.yml - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.PAT_TOKEN }} inputs: '{"event_name": "schedule"}' - name: Trigger Linux x86_64 Build uses: benc-uk/workflow-dispatch@v1 with: workflow: linux-x86_64-nightly.yml - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.PAT_TOKEN }} inputs: '{"event_name": "schedule"}' - name: Trigger Linux ARM64 Build uses: benc-uk/workflow-dispatch@v1 with: workflow: linux-aarch64-nightly.yml - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.PAT_TOKEN }} inputs: '{"event_name": "schedule"}' \ No newline at end of file From 12053fe1b47c8b99f95f9276bcc57ca1a91f2a20 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 20:08:36 +0100 Subject: [PATCH 35/45] test release workflow --- .github/workflows/linux-aarch64-nightly.yml | 2 +- .github/workflows/linux-x86_64-nightly.yml | 2 +- .github/workflows/macos-nightly.yml | 2 +- .github/workflows/test-release.yml | 6 +----- .github/workflows/windows-nightly.yml | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 1ad969d..55dfddc 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -139,7 +139,7 @@ jobs: path: src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb - name: Create Release - if: github.event_name == 'schedule' # Only create release for scheduled builds + if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: name: Linux ARM64 Nightly Build ${{ github.sha }} diff --git a/.github/workflows/linux-x86_64-nightly.yml b/.github/workflows/linux-x86_64-nightly.yml index cb5ae14..5b819d0 100644 --- a/.github/workflows/linux-x86_64-nightly.yml +++ b/.github/workflows/linux-x86_64-nightly.yml @@ -67,7 +67,7 @@ jobs: path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb - name: Create Release - if: github.event_name == 'schedule' # Only create release for scheduled builds + if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: name: Linux Nightly Build ${{ github.sha }} diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index 08daa8a..5d7fda0 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -67,7 +67,7 @@ jobs: path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg - name: Create Release - if: github.event_name == 'schedule' # Only create release for scheduled builds + if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: name: Nightly Build ${{ github.sha }} diff --git a/.github/workflows/test-release.yml b/.github/workflows/test-release.yml index 28ca0d6..c423f48 100644 --- a/.github/workflows/test-release.yml +++ b/.github/workflows/test-release.yml @@ -14,25 +14,21 @@ jobs: with: workflow: macos-nightly.yml token: ${{ secrets.PAT_TOKEN }} - inputs: '{"event_name": "schedule"}' - name: Trigger Windows Build uses: benc-uk/workflow-dispatch@v1 with: workflow: windows-nightly.yml token: ${{ secrets.PAT_TOKEN }} - inputs: '{"event_name": "schedule"}' - name: Trigger Linux x86_64 Build uses: benc-uk/workflow-dispatch@v1 with: workflow: linux-x86_64-nightly.yml token: ${{ secrets.PAT_TOKEN }} - inputs: '{"event_name": "schedule"}' - name: Trigger Linux ARM64 Build uses: benc-uk/workflow-dispatch@v1 with: workflow: linux-aarch64-nightly.yml - token: ${{ secrets.PAT_TOKEN }} - inputs: '{"event_name": "schedule"}' \ No newline at end of file + token: ${{ secrets.PAT_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index c2dba75..dae60e0 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -48,7 +48,7 @@ jobs: path: src-tauri/target/release/*.exe - name: Create Release - if: github.event_name == 'schedule' # Only create release for scheduled builds + if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: name: Windows Nightly Build ${{ github.sha }} From 5b488a3887fcee66bfce4dec57cb32c86314f90d Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 20:19:32 +0100 Subject: [PATCH 36/45] changing github token --- .github/workflows/linux-aarch64-nightly.yml | 2 +- .github/workflows/linux-x86_64-nightly.yml | 2 +- .github/workflows/macos-nightly.yml | 6 +++--- .github/workflows/windows-nightly.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 55dfddc..0b736b3 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -149,4 +149,4 @@ jobs: src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb prerelease: true env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/linux-x86_64-nightly.yml b/.github/workflows/linux-x86_64-nightly.yml index 5b819d0..cb3c6d2 100644 --- a/.github/workflows/linux-x86_64-nightly.yml +++ b/.github/workflows/linux-x86_64-nightly.yml @@ -77,4 +77,4 @@ jobs: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb prerelease: true env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index 5d7fda0..4fef7b5 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -70,11 +70,11 @@ jobs: if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: - name: Nightly Build ${{ github.sha }} - tag_name: nightly-${{ github.sha }} + name: MacOS Nightly Build ${{ github.sha }} + tag_name: macos-nightly-${{ github.sha }} files: | src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg prerelease: true env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index dae60e0..c243447 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -56,4 +56,4 @@ jobs: files: src-tauri/target/release/*.exe prerelease: true env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file From 0ced985cc9a9b3e0665f224c3936c704dac0584a Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 20:35:11 +0100 Subject: [PATCH 37/45] release names --- .github/workflows/linux-aarch64-nightly.yml | 6 +++--- .github/workflows/linux-x86_64-nightly.yml | 6 +++--- .github/workflows/macos-nightly.yml | 6 +++--- .github/workflows/windows-nightly.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 0b736b3..50443d3 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -142,11 +142,11 @@ jobs: if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: - name: Linux ARM64 Nightly Build ${{ github.sha }} - tag_name: linux-arm64-nightly-${{ github.sha }} + name: Linux ARM64 Nightly Build + tag_name: linux-arm64-nightly-latest files: | src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/appimage/*.AppImage src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb - prerelease: true + prerelease: false env: GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/linux-x86_64-nightly.yml b/.github/workflows/linux-x86_64-nightly.yml index cb3c6d2..a4430ee 100644 --- a/.github/workflows/linux-x86_64-nightly.yml +++ b/.github/workflows/linux-x86_64-nightly.yml @@ -70,11 +70,11 @@ jobs: if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: - name: Linux Nightly Build ${{ github.sha }} - tag_name: linux-nightly-${{ github.sha }} + name: Linux x86_64 Nightly Build + tag_name: linux-x86_64-nightly-latest files: | src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb - prerelease: true + prerelease: false env: GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index 4fef7b5..1eba505 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -70,11 +70,11 @@ jobs: if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: - name: MacOS Nightly Build ${{ github.sha }} - tag_name: macos-nightly-${{ github.sha }} + name: MacOS Nightly Build + tag_name: macos-nightly-latest files: | src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg - prerelease: true + prerelease: false env: GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index c243447..36a90e0 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -51,9 +51,9 @@ jobs: if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds uses: softprops/action-gh-release@v1 with: - name: Windows Nightly Build ${{ github.sha }} - tag_name: windows-nightly-${{ github.sha }} + name: Windows Nightly Build + tag_name: windows-nightly-latest files: src-tauri/target/release/*.exe - prerelease: true + prerelease: false env: GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file From e67fa3c81730c5464e937e7e2292a0e7f1aea0dd Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 20:56:14 +0100 Subject: [PATCH 38/45] apple signing environment vars --- .github/workflows/macos-nightly.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index 1eba505..ac6e7a7 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -48,11 +48,19 @@ jobs: run: | echo "Building for x86_64..." npm run tauri build -- --target x86_64-apple-darwin --bundles dmg + env: + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - name: Build for Apple Silicon run: | echo "Building for aarch64..." npm run tauri build -- --target aarch64-apple-darwin --bundles dmg + env: + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} + APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} - name: Upload Intel Build uses: actions/upload-artifact@v4 From eaefb6ed22a8bf4264553ba7cc8fcd6ba695d7c8 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 21:07:16 +0100 Subject: [PATCH 39/45] update releases tags --- .github/workflows/linux-aarch64-nightly.yml | 10 +++++++--- .github/workflows/linux-x86_64-nightly.yml | 10 +++++++--- .github/workflows/macos-nightly.yml | 10 +++++++--- .github/workflows/windows-nightly.yml | 10 +++++++--- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 8 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 50443d3..2f9ece4 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -138,12 +138,16 @@ jobs: name: linux-deb-aarch64 path: src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb + - name: Get version from package.json + id: version + run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT + - name: Create Release - if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds + if: github.event_name == 'workflow_dispatch' uses: softprops/action-gh-release@v1 with: - name: Linux ARM64 Nightly Build - tag_name: linux-arm64-nightly-latest + name: "Linux ARM64 Nightly Build v${{ steps.version.outputs.version }}" + tag_name: "linux-arm64-nightly-${{ steps.version.outputs.version }}" files: | src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/appimage/*.AppImage src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb diff --git a/.github/workflows/linux-x86_64-nightly.yml b/.github/workflows/linux-x86_64-nightly.yml index a4430ee..bf75a96 100644 --- a/.github/workflows/linux-x86_64-nightly.yml +++ b/.github/workflows/linux-x86_64-nightly.yml @@ -66,12 +66,16 @@ jobs: name: linux-deb path: src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb + - name: Get version from package.json + id: version + run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT + - name: Create Release - if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds + if: github.event_name == 'workflow_dispatch' uses: softprops/action-gh-release@v1 with: - name: Linux x86_64 Nightly Build - tag_name: linux-x86_64-nightly-latest + name: "Linux x86_64 Nightly Build v${{ steps.version.outputs.version }}" + tag_name: "linux-x86_64-nightly-${{ steps.version.outputs.version }}" files: | src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage/*.AppImage src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/*.deb diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index ac6e7a7..b1ee802 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -74,12 +74,16 @@ jobs: name: macos-apple-silicon-build path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg + - name: Get version from package.json + id: version + run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT + - name: Create Release - if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds + if: github.event_name == 'workflow_dispatch' uses: softprops/action-gh-release@v1 with: - name: MacOS Nightly Build - tag_name: macos-nightly-latest + name: "MacOS Nightly Build v${{ steps.version.outputs.version }}" + tag_name: "macos-nightly-${{ steps.version.outputs.version }}" files: | src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index 36a90e0..97787cb 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -47,12 +47,16 @@ jobs: name: windows-exe path: src-tauri/target/release/*.exe + - name: Get version from package.json + id: version + run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT + - name: Create Release - if: github.event_name == 'workflow_dispatch' # Only create release for scheduled builds + if: github.event_name == 'workflow_dispatch' uses: softprops/action-gh-release@v1 with: - name: Windows Nightly Build - tag_name: windows-nightly-latest + name: "Windows Nightly Build v${{ steps.version.outputs.version }}" + tag_name: "windows-nightly-${{ steps.version.outputs.version }}" files: src-tauri/target/release/*.exe prerelease: false env: diff --git a/package.json b/package.json index 7d66d1b..8e77e60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "macos-task-manager", - "version": "1.0.5", + "version": "1.0.6", "description": "", "type": "module", "scripts": { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 2c9c275..fcb010b 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1608,7 +1608,7 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "macos-task-manager" -version = "1.0.5" +version = "1.0.6" dependencies = [ "serde", "serde_json", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 50b8914..d418e3a 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "macos-task-manager" -version = "1.0.5" +version = "1.0.6" description = "A Tauri App" authors = ["you"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f12258f..46b9a85 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -28,7 +28,7 @@ }, "productName": "NeoHtop", "mainBinaryName": "NeoHtop", - "version": "1.0.5", + "version": "1.0.6", "identifier": "com.neohtop.dev", "plugins": {}, "app": { From 3fe8aed8b4420a0b2d9ceb2ed12d0dd1f3e9a27d Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 21:33:01 +0100 Subject: [PATCH 40/45] fix windows workflow --- .github/workflows/windows-nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-nightly.yml b/.github/workflows/windows-nightly.yml index 97787cb..e950ad5 100644 --- a/.github/workflows/windows-nightly.yml +++ b/.github/workflows/windows-nightly.yml @@ -49,6 +49,7 @@ jobs: - name: Get version from package.json id: version + shell: bash # Force using bash shell run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT - name: Create Release From 18dca2a89c5e233f8cf5ad3a8d3c105b5c212fd9 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 22:05:39 +0100 Subject: [PATCH 41/45] update macos workflow --- .github/workflows/macos-nightly.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index b1ee802..36adb01 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -46,8 +46,8 @@ jobs: - name: Build for Intel Mac run: | - echo "Building for x86_64..." - npm run tauri build -- --target x86_64-apple-darwin --bundles dmg + echo "Building for Intel Mac..." + npm run tauri build -- --target intel-apple-darwin --bundles dmg env: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} @@ -55,8 +55,8 @@ jobs: - name: Build for Apple Silicon run: | - echo "Building for aarch64..." - npm run tauri build -- --target aarch64-apple-darwin --bundles dmg + echo "Building for Apple Silicon..." + npm run tauri build -- --target apple-silicon-darwin --bundles dmg env: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} @@ -66,13 +66,13 @@ jobs: uses: actions/upload-artifact@v4 with: name: macos-intel-build - path: src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg + path: src-tauri/target/intel-apple-darwin/release/bundle/dmg/*.dmg - name: Upload Apple Silicon Build uses: actions/upload-artifact@v4 with: name: macos-apple-silicon-build - path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg + path: src-tauri/target/apple-silicon-darwin/release/bundle/dmg/*.dmg - name: Get version from package.json id: version @@ -85,8 +85,8 @@ jobs: name: "MacOS Nightly Build v${{ steps.version.outputs.version }}" tag_name: "macos-nightly-${{ steps.version.outputs.version }}" files: | - src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg - src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg + src-tauri/target/intel-apple-darwin/release/bundle/dmg/*.dmg + src-tauri/target/apple-silicon-darwin/release/bundle/dmg/*.dmg prerelease: false env: GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file From 98b53cad3f118def111e8c8509a388aeaa98e646 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 22:11:21 +0100 Subject: [PATCH 42/45] update macos workflow --- .github/workflows/macos-nightly.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/macos-nightly.yml b/.github/workflows/macos-nightly.yml index 36adb01..bd3416f 100644 --- a/.github/workflows/macos-nightly.yml +++ b/.github/workflows/macos-nightly.yml @@ -47,7 +47,10 @@ jobs: - name: Build for Intel Mac run: | echo "Building for Intel Mac..." - npm run tauri build -- --target intel-apple-darwin --bundles dmg + npm run tauri build -- --target x86_64-apple-darwin --bundles dmg + # Rename the Intel build + cd src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/ + for f in *.dmg; do mv "$f" "intel-$f"; done env: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} @@ -55,8 +58,11 @@ jobs: - name: Build for Apple Silicon run: | - echo "Building for Apple Silicon..." - npm run tauri build -- --target apple-silicon-darwin --bundles dmg + echo "Building for aarch64..." + npm run tauri build -- --target aarch64-apple-darwin --bundles dmg + # Rename the Apple Silicon build + cd src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/ + for f in *.dmg; do mv "$f" "silicon-$f"; done env: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} @@ -66,13 +72,13 @@ jobs: uses: actions/upload-artifact@v4 with: name: macos-intel-build - path: src-tauri/target/intel-apple-darwin/release/bundle/dmg/*.dmg + path: src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg - name: Upload Apple Silicon Build uses: actions/upload-artifact@v4 with: name: macos-apple-silicon-build - path: src-tauri/target/apple-silicon-darwin/release/bundle/dmg/*.dmg + path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg - name: Get version from package.json id: version @@ -85,8 +91,8 @@ jobs: name: "MacOS Nightly Build v${{ steps.version.outputs.version }}" tag_name: "macos-nightly-${{ steps.version.outputs.version }}" files: | - src-tauri/target/intel-apple-darwin/release/bundle/dmg/*.dmg - src-tauri/target/apple-silicon-darwin/release/bundle/dmg/*.dmg + src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg + src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg prerelease: false env: GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file From 747ff31518c39ff41091bbc9628a9c7d03d1b44f Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 23:09:20 +0100 Subject: [PATCH 43/45] adds new download buttons for windows and linux --- .github/workflows/build-check.yml | 48 ++++++ docs/index.html | 179 ++++++++++++++++---- docs/styles.css | 262 +++++++++++++++++++++++++++++- src/lib/components/AppInfo.svelte | 48 ++++-- 4 files changed, 489 insertions(+), 48 deletions(-) create mode 100644 .github/workflows/build-check.yml diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml new file mode 100644 index 0000000..5e96c33 --- /dev/null +++ b/.github/workflows/build-check.yml @@ -0,0 +1,48 @@ +name: Build Check + +on: + pull_request: + branches: [ main ] + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + name: Build Check + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 'lts/*' + cache: 'npm' + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Install Linux Dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + build-essential \ + pkg-config \ + libgtk-3-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev \ + libglib2.0-dev \ + libjavascriptcoregtk-4.0-dev \ + libsoup-3.0-dev \ + libwebkit2gtk-4.1-dev + + - name: Install Dependencies + run: npm install + + - name: Build Frontend + run: npm run build + + - name: Build Application + run: npm run tauri build \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 1ac5b66..9cd5304 100644 --- a/docs/index.html +++ b/docs/index.html @@ -127,39 +127,98 @@
-

Download

-

Choose the version that matches your system

-
- - 💻 -
- Intel Mac - For Intel-based Macs -
- - - 🍎 -
- Apple Silicon - For M1/M2/M3 Macs -
- - - 🐧 -
- Linux ARM64 - For ARM64-based Linux (.deb) -
- +

Download NeoHtop

+

Choose your platform to get started

+
+ Current Version: Loading...
-
- ✓ - Notarized by Apple for enhanced security - Learn more +
+ +
+

macOS

+ +
+ Notarized by Apple +
+
+ + 💻 +
+ Intel Chip + macOS 10.15 or later +
+ + + 🍎 +
+ Apple Silicon + macOS 11.0 or later +
+ +
+
+ + +
+

Windows

+
+ + 🪟 +
+ Windows + Windows 10 or later +
+ +
+
+ + +
+

Linux

+
+ +
+

x86_64

+ + 📦 +
+ .deb Package + Debian/Ubuntu +
+ + + 🐧 +
+ AppImage + Universal Linux +
+ +
+ + +
+

ARM64

+ + 📦 +
+ .deb Package + Debian/Ubuntu ARM64 +
+ + + 🐧 +
+ AppImage + Universal Linux ARM64 +
+ +
+
+
@@ -327,6 +386,62 @@

+ \ No newline at end of file diff --git a/docs/styles.css b/docs/styles.css index 98ea960..39aff8f 100644 --- a/docs/styles.css +++ b/docs/styles.css @@ -348,28 +348,60 @@ section { /* Download Section */ .download-options { display: flex; - gap: 1rem; + gap: 1.5rem; justify-content: center; margin: 2rem 0; flex-wrap: wrap; + padding: 0 1rem; } .download-button { background: var(--primary-color); color: white; - padding: 1rem 2rem; + padding: 1rem 1.5rem; border-radius: 8px; text-decoration: none; display: flex; align-items: center; - gap: 0.5rem; + gap: 1rem; transition: all 0.2s; - position: relative; + min-width: 250px; +} + +.download-button .button-text { + display: flex; + flex-direction: column; + gap: 0.25rem; +} + +.download-button .primary { + font-weight: 600; + font-size: 1rem; +} + +.download-button .secondary { + font-size: 0.85rem; + opacity: 0.9; +} + +/* New styles for nested links */ +.download-button .secondary a { + color: inherit; + text-decoration: none; + padding: 2px 6px; + border-radius: 4px; + transition: all 0.2s; + display: inline-block; +} + +.download-button .secondary a:hover { + background-color: rgba(255, 255, 255, 0.2); + transform: translateY(-1px); } .download-button:hover { transform: translateY(-2px); - background: var(--secondary-color); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); } .download-button .icon { @@ -1104,4 +1136,224 @@ footer { .hero-background { flex: 0 0 100%; } +} + +.download-button.windows { + background: #00a4ef; +} + +.download-button.windows:hover { + background: #0090d5; +} + +.download-button.linux { + background: var(--primary-color); + flex-direction: column; + align-items: flex-start; + padding: 1rem 1.5rem; +} + +.download-button.linux:hover { + background: var(--secondary-color); +} + +.download-options-group { + display: flex; + flex-direction: column; + gap: 0.25rem; +} + +.download-option { + display: flex; + align-items: center; + gap: 0.5rem; + font-size: 0.85rem; +} + +.download-option .format { + color: rgba(255, 255, 255, 0.8); + min-width: 65px; +} + +.download-option .separator { + color: rgba(255, 255, 255, 0.4); + font-size: 0.7rem; +} + +.download-option a { + color: inherit; + text-decoration: none; + padding: 2px 6px; + border-radius: 4px; + transition: all 0.2s; +} + +.download-option a:hover { + background-color: rgba(255, 255, 255, 0.2); + transform: translateY(-1px); +} + +.download-button.linux .secondary { + line-height: 1.6; + font-size: 0.85rem; +} + +.download-button.linux .secondary a { + color: inherit; + text-decoration: none; + padding: 2px 6px; + border-radius: 4px; + transition: all 0.2s; + white-space: nowrap; +} + +.download-button.linux .secondary a:hover { + background-color: rgba(255, 255, 255, 0.2); + transform: translateY(-1px); +} + +.download-button.linux .secondary .separator { + opacity: 0.7; + margin: 0 2px; +} + +.downloads { + padding: 2rem 0; +} + +.download-container { + max-width: 900px; + margin: 0 auto; + padding: 2rem; + text-align: center; +} + +.download-container h2 { + font-size: 2.5rem; + margin-bottom: 1rem; + background: linear-gradient(135deg, var(--primary-color), var(--secondary-color)); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; +} + +.download-subtitle { + color: var(--text-secondary); + margin-bottom: 3rem; +} + +.download-options { + display: flex; + flex-direction: column; + gap: 2.5rem; +} + +.download-group { + display: flex; + flex-direction: column; + gap: 1rem; +} + +.platform-title { + font-size: 1.2rem; + color: var(--text-secondary); + text-align: left; + margin-bottom: 0.5rem; +} + +.platform-options { + display: flex; + gap: 1rem; + justify-content: center; +} + +.download-button { + background: var(--card-background); + color: var(--text-primary); + padding: 1rem 1.5rem; + border-radius: 12px; + text-decoration: none; + display: flex; + align-items: center; + gap: 1rem; + transition: all 0.2s; + border: 1px solid rgba(255, 255, 255, 0.1); + min-width: 250px; +} + +.download-button:hover { + transform: translateY(-2px); + border-color: var(--primary-color); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); +} + +.download-button .icon { + font-size: 1.5rem; +} + +.button-text { + display: flex; + flex-direction: column; + gap: 0.25rem; + text-align: left; +} + +.button-text .primary { + font-weight: 600; + font-size: 1rem; +} + +.button-text .secondary { + font-size: 0.85rem; + opacity: 0.8; +} + +.linux-options { + display: flex; + flex-direction: column; + gap: 1.5rem; +} + +.format-group { + display: flex; + flex-direction: column; + gap: 0.5rem; +} + +.format-label { + font-size: 0.9rem; + color: var(--text-secondary); + text-align: left; +} + +.format-buttons { + display: flex; + gap: 1rem; + justify-content: center; +} + +.format-buttons .download-button { + min-width: 150px; +} + +/* Dark mode adjustments */ +[data-theme="dark"] .download-button { + background: rgba(30, 41, 59, 0.8); + border-color: rgba(255, 255, 255, 0.1); +} + +[data-theme="dark"] .download-button:hover { + border-color: var(--primary-color); + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2); +} + +.version-info { + text-align: center; + margin: 1rem 0; + font-size: 0.9rem; + color: var(--text-secondary); +} + +#current-version { + font-weight: 600; + color: var(--primary-color); } \ No newline at end of file diff --git a/src/lib/components/AppInfo.svelte b/src/lib/components/AppInfo.svelte index 687403c..020ea52 100644 --- a/src/lib/components/AppInfo.svelte +++ b/src/lib/components/AppInfo.svelte @@ -32,16 +32,43 @@ "https://api.github.com/repos/abdenasser/neohtop/releases/latest", ); const data = await response.json(); - latestVersion = data.tag_name.replace("v", ""); - hasUpdate = version && latestVersion && version !== latestVersion; + + // Extract version number from tag (e.g., "1.0.6" from "macos-nightly-1.0.6") + const versionMatch = data.tag_name.match(/\d+\.\d+\.\d+/); + if (!versionMatch) { + console.warn( + "Unexpected version format in latest release:", + data.tag_name, + ); + return; + } + + latestVersion = versionMatch[0]; + + // Extract version number from current version + const currentVersionMatch = version.match(/\d+\.\d+\.\d+/); + if (!currentVersionMatch) { + console.warn("Unexpected current version format:", version); + return; + } + + // Compare only the version numbers + hasUpdate = currentVersionMatch[0] !== latestVersion; } catch (error) { console.error("Failed to check latest version:", error); + latestVersion = ""; + hasUpdate = false; } } onMount(async () => { - version = await getVersion(); - await checkLatestVersion(); + try { + version = await getVersion(); + await checkLatestVersion(); + } catch (error) { + console.error("Failed to initialize version info:", error); + version = ""; + } }); @@ -85,14 +112,13 @@ source :: + href={APP_INFO.github} + class="value" + target="_blank" + rel="noopener noreferrer" + > {APP_INFO.github} - - +
stack From 29651e2b9bc17b2740fe799749a7245c44e56d8a Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 23:11:42 +0100 Subject: [PATCH 44/45] adds new download buttons for windows and linux --- build-universal.sh | 38 -------------------------------------- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 5 files changed, 4 insertions(+), 42 deletions(-) delete mode 100755 build-universal.sh diff --git a/build-universal.sh b/build-universal.sh deleted file mode 100755 index 9e9f73d..0000000 --- a/build-universal.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -# source .env for notarization credentials -echo "Sourcing .env..." -if [ -f .env ]; then - source .env - # Verify that required environment variables are set - if [ -z "$APPLE_ID" ] || [ -z "$APPLE_PASSWORD" ] || [ -z "$APPLE_TEAM_ID" ]; then - echo "Error: Required environment variables are not set" - echo "Please ensure your .env file contains:" - echo "APPLE_ID=your.email@example.com" - echo "APPLE_PASSWORD=your-app-specific-password" - echo "APPLE_TEAM_ID=your-team-id" - exit 1 - fi - # Export the variables so they are available to child processes - export APPLE_ID - export APPLE_PASSWORD - export APPLE_TEAM_ID -else - echo "Error: .env file not found" - echo "Please create a .env file with the following variables:" - echo "APPLE_ID=your.email@example.com" - echo "APPLE_PASSWORD=your-app-specific-password" - echo "APPLE_TEAM_ID=your-team-id" - exit 1 -fi - -# Build frontend -npm run build - -# Build for Intel -echo "Building for x86_64..." -npm run tauri build -- --target x86_64-apple-darwin --bundles dmg - -# Build for Apple Silicon -echo "Building for aarch64..." -npm run tauri build -- --target aarch64-apple-darwin --bundles dmg - diff --git a/package.json b/package.json index 8e77e60..30cda44 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "macos-task-manager", - "version": "1.0.6", + "version": "1.0.7", "description": "", "type": "module", "scripts": { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index fcb010b..9ee4e93 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1608,7 +1608,7 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "macos-task-manager" -version = "1.0.6" +version = "1.0.7" dependencies = [ "serde", "serde_json", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d418e3a..db2b202 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "macos-task-manager" -version = "1.0.6" +version = "1.0.7" description = "A Tauri App" authors = ["you"] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 46b9a85..3c38462 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -28,7 +28,7 @@ }, "productName": "NeoHtop", "mainBinaryName": "NeoHtop", - "version": "1.0.6", + "version": "1.0.7", "identifier": "com.neohtop.dev", "plugins": {}, "app": { From 3d2b63fbf6cf64216317e604272a8b206acb1b14 Mon Sep 17 00:00:00 2001 From: Abdenasser Date: Thu, 7 Nov 2024 23:29:52 +0100 Subject: [PATCH 45/45] fixed landing page download buttons styles for light mode --- docs/index.html | 2 +- docs/styles.css | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/docs/index.html b/docs/index.html index 9cd5304..996c032 100644 --- a/docs/index.html +++ b/docs/index.html @@ -165,7 +165,7 @@

Windows

- 🪟 + 🫣
Windows Windows 10 or later diff --git a/docs/styles.css b/docs/styles.css index 39aff8f..1349533 100644 --- a/docs/styles.css +++ b/docs/styles.css @@ -1147,14 +1147,11 @@ footer { } .download-button.linux { - background: var(--primary-color); - flex-direction: column; - align-items: flex-start; - padding: 1rem 1.5rem; + background: #E95420; } .download-button.linux:hover { - background: var(--secondary-color); + background: #C7431B; } .download-options-group { @@ -1267,8 +1264,8 @@ footer { } .download-button { - background: var(--card-background); - color: var(--text-primary); + background: var(--primary-color); + color: white; padding: 1rem 1.5rem; border-radius: 12px; text-decoration: none; @@ -1276,14 +1273,14 @@ footer { align-items: center; gap: 1rem; transition: all 0.2s; - border: 1px solid rgba(255, 255, 255, 0.1); + border: 1px solid transparent; min-width: 250px; } .download-button:hover { transform: translateY(-2px); - border-color: var(--primary-color); - box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); + background: var(--secondary-color); + box-shadow: 0 4px 12px rgba(99, 102, 241, 0.2); } .download-button .icon { @@ -1304,7 +1301,7 @@ footer { .button-text .secondary { font-size: 0.85rem; - opacity: 0.8; + opacity: 0.9; } .linux-options {