Updated Fixes for the Linux version of GRDB

.github/workflows/ubuntu-ci.yml

@@ -0,0 +1,97 @@
+# https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
+
+name: "Linux CI"
+
+on:
+  push:
+    branches: 
+      - master
+      - development
+      - grdb_linux_changes
+    paths:
+      - 'GRDB/**'
+      - 'Tests/**'
+      - '.github/workflows/**'
+      - 'Makefile'
+      - 'Package.swift'
+      - 'SQLiteCustom/src'
+  pull_request:
+    paths:
+      - 'GRDB/**'
+      - 'Tests/**'
+      - '.github/workflows/**'
+      - 'Makefile'
+      - 'Package.swift'
+      - 'SQLiteCustom/src'
+
+concurrency: 
+  group: ${{ github.ref_name }}
+  cancel-in-progress: true
+permissions:
+  contents: read
+
+jobs:
+  build-and-test-on-linux:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        swift: ["6.2", "6.1"]
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v5
+
+      - name: Install Swift Dependencies
+        run: | 
+          sudo apt-get update 
+          sudo apt-get install -y \
+          binutils \
+          git \
+          gnupg2 \
+          libc6-dev \
+          libcurl4-openssl-dev \
+          libedit2 \
+          libgcc-13-dev \
+          libpython3-dev \
+          libsqlite3-0 \
+          libstdc++-13-dev \
+          libxml2-dev \
+          libz3-dev \
+          pkg-config \
+          python3-lldb \
+          tzdata \
+          unzip \
+          zip \
+          zlib1g-dev \
+          wget \
+          curl \
+          ca-certificates \
+          util-linux
+
+      - name: Cache Swiftly toolchains
+        id: cache-swiftly
+        uses: actions/cache@v4
+        with:
+          path: ${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}
+          key: swiftly-${{ matrix.os }}-${{ matrix.swift }}
+
+      - name: Install Swift Using Swiftly  
+        if: steps.cache-swiftly.outputs.cache-hit != 'true'
+        run: |
+          curl -O https://download.swift.org/swiftly/linux/swiftly-$(uname -m).tar.gz
+          tar zxf swiftly-$(uname -m).tar.gz
+          ./swiftly init --quiet-shell-followup -y --skip-install
+          . "${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}/env.sh"
+          hash -r
+          swiftly install ${{ matrix.swift }} --assume-yes --use
+          . "${SWIFTLY_HOME_DIR:-$HOME/.local/share/swiftly}/env.sh"  
+
+      - name: Build SPM Package
+        run: |
+          swift build -c release
+
+      - name: Run tests
+        run: |
+          swift test -c release

Package.swift

@@ -14,12 +14,6 @@ let darwinPlatforms: [Platform] = [
 ]
 var swiftSettings: [SwiftSetting] = [
     .define("SQLITE_ENABLE_FTS5"),
-    // Until Xcode has proper support for package traits, we must enable
-    // SQLITE_ENABLE_SNAPSHOT by default so that Xcode projects that build
-    // a Darwin app can depend on GRDB and profit from WAL snapshots.
-    // Package traits who want to disable snapshots must set SQLITE_DISABLE_SNAPSHOT.
-    // TODO: when Xcode support traits, remove all mentions of SQLITE_DISABLE_SNAPSHOT and update as below:
-    // .define("SQLITE_ENABLE_SNAPSHOT", .when(platforms: darwinPlatforms, traits: ["GRDBSQLite"])),
     .define("SQLITE_ENABLE_SNAPSHOT"),
     // Not all Linux distributions have support for WAL snapshots.
     .define("SQLITE_DISABLE_SNAPSHOT", .when(platforms: [.linux])),
@@ -58,10 +52,6 @@ let package = Package(
         .library(name: "GRDB", targets: ["GRDB"]),
         .library(name: "GRDB-dynamic", type: .dynamic, targets: ["GRDB"]),
     ],
-    traits: [
-        "GRDBSQLite",
-        .default(enabledTraits: ["GRDBSQLite"]),
-    ],
     dependencies: dependencies,
     targets: [
         .systemLibrary(
@@ -70,7 +60,7 @@ let package = Package(
         .target(
             name: "GRDB",
             dependencies: [
-                .target(name: "GRDBSQLite", condition: .when(traits: ["GRDBSQLite"])),
+                .target(name: "GRDBSQLite"),
             ],
             path: "GRDB",
             resources: [.copy("PrivacyInfo.xcprivacy")],

README.md

@@ -13,6 +13,7 @@
     <a href="https://developer.apple.com/swift/"><img alt="Swift 6.1" src="https://img.shields.io/badge/swift-6.1-orange.svg?style=flat"></a>
     <a href="https://github.com/groue/GRDB.swift/blob/master/LICENSE"><img alt="License" src="https://img.shields.io/github/license/groue/GRDB.swift.svg?maxAge=2592000"></a>
     <a href="https://github.com/groue/GRDB.swift/actions/workflows/CI.yml"><img alt="CI Status" src="https://github.com/groue/GRDB.swift/actions/workflows/CI.yml/badge.svg?branch=master"></a>
+    <a href="https://github.com/groue/GRDB.swift/actions/workflows/ubuntu-ci.yml"><img alt="Linux Status" src="https://github.com/groue/GRDB.swift/actions/workflows/ubuntu-ci.yml/badge.svg?branch=master"></a>
 </p>
 
 ---