build on different ubuntu versions

m42e · Jul 5, 2024 · d73823e · d73823e
1 parent 712e7a8
commit d73823e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -17,7 +17,10 @@ jobs:
       - run: cargo fmt -- --check
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
 
     steps:
       - name: Checkout
@@ -40,7 +43,21 @@ jobs:
         run: |
           sudo apt-get update \
           && sudo apt-get install -y \
-          libdbus-1-dev
+          libdbus-1-dev libsqlite3-dev libssl-dev pkg-config
+      - name: Install dependencies
+        if: matrix.os == 'ubuntu-20.04'
+        run: |
+          sudo apt-get update \
+          && sudo apt-get install -y \
+          libdbus-1-dev libsqlite3-dev libssl-dev pkg-config libc6
+
+      - name: Install dependencies
+        if: matrix.os != 'ubuntu-20.04'
+        run: |
+          sudo apt-get update \
+          && sudo apt-get install -y \
+          libdbus-1-dev libsqlite3-dev libssl-dev pkg-config
+
       - name: Build
         run: cargo build --all --release && strip target/release/zsh-histdb-skim target/release/zsh-histdb-skim
 
@@ -49,7 +66,7 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: target/release/zsh-histdb-skim
-          asset_name: zsh-histdb-skim-linux-x64
+          asset_name: zsh-histdb-skim-linux-x64-${{ matrix.os }}
           tag: ${{ github.ref }}
           overwrite: true
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zsh-histdb-skim"
-version = "0.9.1"
+version = "0.9.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/src/main.rs b/src/main.rs
@@ -236,7 +236,7 @@ fn main() -> Result<()> {
     }(args);
 
     if query == "--version" {
-        println!("v0.9.1");
+        println!("v0.9.2");
         std::process::exit(1);
     }
 

diff --git a/zsh-histdb-skim.zsh b/zsh-histdb-skim.zsh
@@ -2,7 +2,7 @@ XDG_BIN_PATH=${XDG_DATA_HOME:-$HOME/.local/share}/zsh-histdb-skim/
 BIN_DIR=${HISTDB_SKIM_PATH:-${XDG_BIN_PATH}}
 BIN_PATH=${BIN_DIR}/zsh-histdb-skim
 
-HISTB_SKIM_VERSION="v0.9.1"
+HISTB_SKIM_VERSION="v0.9.2"
 
 histdb-skim-get-os(){
   UNAME_STR=`uname -a`
@@ -12,8 +12,9 @@ histdb-skim-get-os(){
   if [[ ( $UNAME_STR =~ '.*Darwin.*' ) && ( $UNAME_STR =~ '.*arm64.*') ]]; then
     echo -n "darwin-arm"
   fi
-  if [[ ( $UNAME_STR =~ '.*Linux.*' ) && ( $UNAME_STR =~ '.*x86_64.*') ]]; then
-    echo -n "linux-x64"
+  if [ -f /etc/lsb-release ]; then
+    VERSION=$(lsb_release -rs)
+    echo -n "linux-x64-ubuntu-${VERSION}"
   fi
 }