refactor: update git clone and checkout process in CI workflows

RedisJSON · eranhd · Dec 24, 2024 · Dec 5, 2024 · Dec 5, 2024 · Dec 5, 2024
commit f3b274facaa8b6d830c9f368a60c61d90c77aa5a
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -25,7 +25,10 @@ jobs:
           # Perform checkout
           REPO_URL="https://github.com/${{ github.repository }}.git"
           # Clone the repository to the current directory
-          git clone --recurse-submodules --depth=1 -b ${{github.sha}} $REPO_URL .
+          git clone --recurse-submodules --depth=1 $REPO_URL .
+          REF=${{github.sha}}
+          git fetch origin ${REF}
+          git checkout ${REF}
       - name: Install python dependencies
         run: |
           pip install -q --upgrade setuptools
@@ -39,7 +42,9 @@ jobs:
           # Perform checkout
           REPO_URL="https://github.com/redis/redis.git"
           # Clone the repository to the current directory
-          git clone --recurse-submodules --depth=1 -b unstable $REPO_URL redis
+          git clone --recurse-submodules --depth=1 $REPO_URL redis
+          git fetch origin unstable
+          git checkout unstable
       - name: Build Redis
         working-directory: redis
         run: make install

diff --git a/.github/workflows/build-linux-platforms.yml b/.github/workflows/build-linux-platforms.yml
@@ -23,11 +23,16 @@ on:
         required: true
 
 jobs:
-  prepare-matrix-values:
+  prepare-values:
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
+      redis-ref: ${{ steps.set-env.outputs.redis-ref }}
     steps:
+      - name: set env
+        id: set-env
+        run: |
+          echo "redis-ref=${{ inputs.redis-ref || 'unstable' }}" >> $GITHUB_OUTPUT
       - name: Set matrix
         id: set-matrix
         run: |
@@ -73,7 +78,7 @@ jobs:
           echo "matrix=${MATRIX}" >> $GITHUB_OUTPUT
   build-linux-matrix:
     runs-on: ubuntu-latest
-    needs: prepare-matrix-values
+    needs: prepare-values
     strategy:
       fail-fast: false
       matrix: 
@@ -97,7 +102,10 @@ jobs:
           # Perform checkout
           REPO_URL="https://github.com/${{ github.repository }}.git"
           # Clone the repository to the current directory
-          git clone --recurse-submodules --depth=1 -b ${{github.sha}} $REPO_URL .
+          git clone --recurse-submodules --depth=1 $REPO_URL .
+          REF=${{github.sha}}
+          git fetch origin ${REF}
+          git checkout ${REF}
       - name: Setup
         working-directory: .install
         run: |
@@ -121,7 +129,9 @@ jobs:
           # Perform checkout
           REPO_URL="https://github.com/redis/redis.git"
           # Clone the repository to the current directory
-          git clone --recurse-submodules --depth=1 -b unstable $REPO_URL redis
+          git clone --recurse-submodules --depth=1 $REPO_URL redis
+          git fetch origin ${{needs.prepare-values.outputs.redis-ref}}
+          git checkout ${{needs.prepare-values.outputs.redis-ref}}
       - name: build
         uses: ./.github/actions/build-json-module-and-redis-with-cargo
       - name: Set Artifact Names

diff --git a/.github/workflows/ci-basic.yml b/.github/workflows/ci-basic.yml
@@ -18,72 +18,10 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
-  build-linux-jammy:
-    runs-on: "ubuntu-latest"
-    container:
-        image: "ubuntu:jammy"
-    defaults:
-      run:
-        shell: bash -l -eo pipefail {0}
-    steps:
-      - name: Install git
-        run: |
-          apt-get update && apt-get install -y git
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
-      - name: Setup
-        working-directory: .install
-        run: |
-          echo ::group::Install dependencies
-          ./ubuntu_22.04.sh
-          echo ::endgroup::
-          echo ::group::Install rust
-          ./getrust.sh
-          echo ::endgroup::
-      - name: Get Redis
-        uses: actions/checkout@v4
-        with:
-          repository: redis/redis
-          ref: 'unstable' # todo change per version/tag
-          path: redis
-      - name: Build Redis
-        working-directory: redis
-        run: |
-          make install
-      - name: Build module
-        run: |
-          . "$HOME/.cargo/env"
-          cargo --version
-          cargo build --release
-      - name: Set Artifact Names
-        # Artifact names have to be unique, so we base them on the environment.
-        # We also remove invalid characters from the name.
-        id: artifact-names
-        run: | # Invalid characters include: Double quote ", Colon :, Less than <, Greater than >, Vertical bar |, Asterisk *, Question mark ?
-          echo "name=$(echo "ubuntu22 x86-64, Redis unstable" | \
-            sed -e 's/[":\/\\<>\|*?]/_/g' -e 's/__*/_/g' -e 's/^_//' -e 's/_$//')" >> $GITHUB_OUTPUT
-      - name: Run tests
-        run: |
-          echo ::group::Activate virtual environment
-          ./.install/activate_venv.sh
-          echo ::endgroup::
-          echo ::group::Install python dependencies
-          ./.install/common_installations.sh
-          echo ::endgroup::
-          echo ::group::Flow tests
-          MODULE=$(realpath ./target/release/librejson.so) RLTEST_ARGS='--no-progress' ./tests/pytest/tests.sh
-          echo ::endgroup::
-          echo ::group::Unit tests
-          cargo test
-          echo ::endgroup::
-        env:
-          PIP_BREAK_SYSTEM_PACKAGES: 1
-      - name: Upload artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: Test logs ${{ steps.artifact-names.outputs.name }}
-          path: tests/**/logs/*.log*
-          if-no-files-found: ignore
+  build-linux:
+    crdt_tests:
+    uses: ./.github/workflows/build-linux-platforms.yaml
+    with:
+      os: jammy focal bionic
+      redis-ref: unstable
+    secrets: inherit