Merge remote-tracking branch 'origin/master' into mt-host-ping

Author: fantix

.github/workflows.src/tests.inc.yml

@@ -68,13 +68,6 @@
 
     # Restore binary cache
 
-    - name: Handle cached EdgeDB CLI binaries
-      uses: actions/cache@v4
-      id: cli-cache
-      with:
-        path: build/cli
-        key: edb-cli-v4-${{ env.EDGEDBCLI_GIT_REV }}
-
     - name: Handle cached Rust extensions
       uses: actions/cache@v4
       id: rust-cache
@@ -116,7 +109,6 @@
 
     - name: Install system deps
       if: |
-        steps.cli-cache.outputs.cache-hit != 'true' ||
         steps.rust-cache.outputs.cache-hit != 'true' ||
         steps.ext-cache.outputs.cache-hit != 'true' ||
         steps.stolon-cache.outputs.cache-hit != 'true' ||
@@ -126,33 +118,9 @@
         sudo apt-get install -y uuid-dev libreadline-dev bison flex libprotobuf-c-dev
 
     - name: Install Rust toolchain
-      if: |
-        steps.cli-cache.outputs.cache-hit != 'true' ||
-        steps.rust-cache.outputs.cache-hit != 'true'
+      if: steps.rust-cache.outputs.cache-hit != 'true'
       uses: dsherret/rust-toolchain-file@v1
 
-    # Build EdgeDB CLI
-
-    - name: Handle EdgeDB CLI build cache
-      uses: actions/cache@v4
-      if: steps.cli-cache.outputs.cache-hit != 'true'
-      with:
-        path: ${{ env.BUILD_TEMP }}/rust/cli
-        key: edb-cli-build-v7-${{ env.EDGEDBCLI_GIT_REV }}
-        restore-keys: |
-          edb-cli-build-v7-
-
-    - name: Build EdgeDB CLI
-      env:
-        CARGO_HOME: ${{ env.BUILD_TEMP }}/rust/cli/cargo_home
-        CACHE_HIT: ${{ steps.cli-cache.outputs.cache-hit }}
-      run: |
-        if [[ "$CACHE_HIT" == "true" ]]; then
-          cp -v build/cli/bin/gel edb/cli/gel
-        else
-          python setup.py -v build_cli
-        fi
-
     # Build Rust extensions
 
     - name: Handle Rust extensions build cache
@@ -309,15 +277,13 @@
     else
       find /usr/lib -type f -name 'lib*' -printf '%P %s\n' | sort | sha256sum | cut -d ' ' -f1 > shared-artifacts/lib_cache_key.txt
     fi
-    python setup.py -q ci_helper --type cli > shared-artifacts/edgedbcli_git_rev.txt
     python setup.py -q ci_helper --type rust >shared-artifacts/rust_cache_key.txt
     python setup.py -q ci_helper --type ext >shared-artifacts/ext_cache_key.txt
     python setup.py -q ci_helper --type parsers >shared-artifacts/parsers_cache_key.txt
     python setup.py -q ci_helper --type postgres >shared-artifacts/postgres_git_rev.txt
     python setup.py -q ci_helper --type libpg_query >shared-artifacts/libpg_query_git_rev.txt
     echo 'f8cd94309eaccbfba5dea7835b88c78377608a37' >shared-artifacts/stolon_git_rev.txt
     python setup.py -q ci_helper --type bootstrap >shared-artifacts/bootstrap_cache_key.txt
-    echo EDGEDBCLI_GIT_REV=$(cat shared-artifacts/edgedbcli_git_rev.txt) >> $GITHUB_ENV
     echo POSTGRES_GIT_REV=$(cat shared-artifacts/postgres_git_rev.txt) >> $GITHUB_ENV
     echo LIBPG_QUERY_GIT_REV=$(cat shared-artifacts/libpg_query_git_rev.txt) >> $GITHUB_ENV
     echo STOLON_GIT_REV=$(cat shared-artifacts/stolon_git_rev.txt) >> $GITHUB_ENV
@@ -350,21 +316,13 @@
 
     - name: Set environment variables
       run: |
-        echo EDGEDBCLI_GIT_REV=$(cat shared-artifacts/edgedbcli_git_rev.txt) >> $GITHUB_ENV
         echo POSTGRES_GIT_REV=$(cat shared-artifacts/postgres_git_rev.txt) >> $GITHUB_ENV
         echo STOLON_GIT_REV=$(cat shared-artifacts/stolon_git_rev.txt) >> $GITHUB_ENV
         echo BUILD_LIB=$(python setup.py -q ci_helper --type build_lib) >> $GITHUB_ENV
         echo BUILD_TEMP=$(python setup.py -q ci_helper --type build_temp) >> $GITHUB_ENV
 
     # Restore build cache
 
-    - name: Restore cached EdgeDB CLI binaries
-      uses: actions/cache@v4
-      id: cli-cache
-      with:
-        path: build/cli
-        key: edb-cli-v4-${{ env.EDGEDBCLI_GIT_REV }}
-
     - name: Restore cached Rust extensions
       uses: actions/cache@v4
       id: rust-cache
@@ -409,7 +367,6 @@
 
     - name: Stop if we cannot retrieve the cache
       if: |
-        steps.cli-cache.outputs.cache-hit != 'true' ||
         steps.rust-cache.outputs.cache-hit != 'true' ||
         steps.ext-cache.outputs.cache-hit != 'true' ||
         steps.parsers-cache.outputs.cache-hit != 'true' ||
@@ -422,9 +379,6 @@
 
     - name: Validate cached binaries
       run: |
-        # Validate EdgeDB CLI
-        ./build/cli/bin/gel --version || exit 1
-
         # Validate Stolon
         ./build/stolon/bin/stolon-sentinel --version || exit 1
         ./build/stolon/bin/stolon-keeper --version || exit 1
@@ -436,8 +390,6 @@
 
     - name: Restore cache into the source tree
       run: |
-        cp -v build/cli/bin/gel edb/cli/edgedb
-        cp -v build/cli/bin/gel edb/cli/gel
         rsync -av ./build/rust_extensions/edb/ ./edb/
         rsync -av ./build/extensions/edb/ ./edb/
         rsync -av ./build/lib/edb/ ./edb/