Merge pull request #209 from louis-e/main

Bring elevation-wip up to date to main code base
louis-e · Jan 6, 2025 · 66819a5 · 66819a5
2 parents c0778c2 + 85f3e55
commit 66819a5
Show file tree

Hide file tree

Showing 12 changed files with 652 additions and 247 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -8,25 +8,37 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v3
 
     - name: Set up Rust
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@v1
       with:
         toolchain: stable
-        target: ${{ matrix.os == 'windows-latest' && 'x86_64-pc-windows-msvc' || 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
+        targets: ${{ matrix.os == 'windows-latest' && 'x86_64-pc-windows-msvc' || 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
         components: clippy
 
+    - name: Install Linux dependencies
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        sudo apt update
+        sudo apt install -y software-properties-common
+        sudo add-apt-repository universe
+        echo "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
+        sudo apt update
+        sudo apt install -y libgtk-3-dev build-essential pkg-config libglib2.0-dev libsoup-3.0-dev libwebkit2gtk-4.1-dev
+        echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
+
     - name: Check formatting
       run: cargo fmt -- --check
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,16 +13,16 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up Rust for Windows
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@v1
       with:
         toolchain: stable
-        target: x86_64-pc-windows-msvc
+        targets: x86_64-pc-windows-msvc
 
     - name: Install dependencies
-      run: cargo fetch
+      run: cargo fetch --locked
 
     - name: Build
-      run: cargo build --release
+      run: cargo build --frozen --release
 
     - name: Upload artifact (Windows)
       uses: actions/upload-artifact@v3