diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml index 8be9f6d187..52f9cc144a 100644 --- a/.github/workflows/claude.yml +++ b/.github/workflows/claude.yml @@ -78,7 +78,7 @@ jobs: - name: install xmlsec1 and gssapi run: | sudo apt-get update - sudo apt-get install -y libxml2-dev libxmlsec1-dev libkrb5-dev libsasl2-dev libcurl4-openssl-dev + sudo apt-get install -y libxml2-dev libxmlsec1-dev libkrb5-dev libsasl2-dev libcurl4-openssl-dev mold clang - uses: actions-rust-lang/setup-rust-toolchain@v1 with: @@ -89,7 +89,7 @@ jobs: working-directory: ./backend timeout-minutes: 16 run: | - SQLX_OFFLINE=true cargo check --features $(./all_features_oss.sh) + SQLX_OFFLINE=true cargo check --features all_sqlx_features - name: Run Claude PR Action uses: anthropics/claude-code-action@v1 @@ -119,7 +119,7 @@ jobs: - Fix all warnings and errors before proceeding **Backend Changes:** - - Run: \`cargo check --features $(./all_features_oss.sh)\` in the backend directory + - Run: \`cargo check --features all_sqlx_features\` in the backend directory - Fix all warnings and errors before proceeding **Pull Request Creation:** diff --git a/.github/workflows/git-commands.yaml b/.github/workflows/git-commands.yaml index c098f856e2..5654108a08 100644 --- a/.github/workflows/git-commands.yaml +++ b/.github/workflows/git-commands.yaml @@ -62,17 +62,17 @@ jobs: path: windmill-ee-private token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }} - # Cache rust dependencies - - uses: dtolnay/rust-toolchain@stable - - uses: Swatinem/rust-cache@v2 + # Setup Rust toolchain + - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - workspaces: "./backend -> target" + cache-workspaces: backend + toolchain: 1.90.0 - name: Install xmlsec and gssapi build-time deps run: | sudo apt-get update sudo apt-get install -y --no-install-recommends \ - pkg-config libxml2-dev libssl-dev libkrb5-dev \ + pkg-config libxml2-dev libssl-dev libkrb5-dev libsasl2-dev libcurl4-openssl-dev mold clang \ xmlsec1 libxmlsec1-dev libxmlsec1-openssl - name: Run update-sqlx script diff --git a/backend/all_features_oss.sh b/backend/all_features_oss.sh deleted file mode 100755 index 8ac9a1ea2b..0000000000 --- a/backend/all_features_oss.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# This script outputs all features except private. Usage : -# > cargo build --features $(./all_features_oss.sh) - -# Path to the Cargo.toml file -CARGO_TOML_PATH="./Cargo.toml" - -# Extract features from Cargo.toml and output them separated by commas -if [[ -f "$CARGO_TOML_PATH" ]]; then - grep -A 100 '\[features\]' "$CARGO_TOML_PATH" | \ - sed -n '/\[features\]/,/^\[/p' | \ - grep -E '^[a-zA-Z0-9_-]+' | \ - grep -v 'private' | \ - grep -v 'benchmark' | \ - cut -d' ' -f1 | \ - paste -sd ',' - -else - echo "Cargo.toml not found at $CARGO_TOML_PATH" - exit 1 -fi \ No newline at end of file