GitHub Actions: Improve caching, cleanup

- Set the correct cache path, previously cache was ineffective
- Build in `${GITHUB_WORKSPACE}/build` sub-directory
- Update `actions/cache` to `v3`
- Reformat build steps
- Use CMake's `-S` and `-B` options to specify source and build directories

PiperOrigin-RevId: 439560955
Change-Id: I6b07fa4e3a6416725fa1d3d2b7174a4186648033

.github/workflows/fedora-cmake.yml

@@ -25,11 +25,11 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         key: ${{matrix.container}}-${{matrix.compiler}}${{matrix.compiler-version}}
         path: |
-          ${{github.workspace}}/_deps
+          ${{github.workspace}}/build/_deps
 
     - name: Prepare container
       # Note: For the sandbox tests to work, we need a privileged, unconfined
@@ -50,9 +50,9 @@ jobs:
     - name: Install build tools
       run: |
         $RUN_CMD dnf update -y --quiet
-        $RUN_CMD dnf install -y --quiet git make automake patch glibc-static \
-          libstdc++-static cmake ninja-build python3 python3-pip clang-devel \
-          libcap-devel
+        $RUN_CMD dnf install -y --quiet \
+          git make automake patch glibc-static libstdc++-static cmake \
+          ninja-build python3 python3-pip clang-devel libcap-devel
 
     - name: Create Build Environment
       run: |
@@ -61,15 +61,22 @@ jobs:
 
     - name: Configure CMake
       run: |
-        $RUN_CMD cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build \
-          -G Ninja -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        $RUN_CMD cmake \
+          -S $GITHUB_WORKSPACE \
+          -B $GITHUB_WORKSPACE/build \
+          -G Ninja \
+          -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
     - name: Build
       run: |
-        $RUN_CMD cmake --build $GITHUB_WORKSPACE/build --config $BUILD_TYPE
+        $RUN_CMD cmake \
+          --build $GITHUB_WORKSPACE/build \
+          --config $BUILD_TYPE
 
     - name: Test
       run: |
-        $RUN_CMD ctest --test-dir $GITHUB_WORKSPACE/build -C $BUILD_TYPE \
+        $RUN_CMD ctest \
+          --test-dir $GITHUB_WORKSPACE/build \
+          -C $BUILD_TYPE \
           --output-on-failure \
           -R SapiTest

.github/workflows/ubuntu-cmake.yml

@@ -43,11 +43,11 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         key: ${{matrix.os}}-${{matrix.compiler}}${{matrix.compiler-version}}
         path: |
-          ${{github.workspace}}/_deps
+          ${{github.workspace}}/build/_deps
 
     - name: Install ninja-build tool
       uses: seanmiddleditch/gha-setup-ninja@v3
@@ -73,13 +73,22 @@ jobs:
 
     - name: Configure CMake
       run: |
-        cmake $GITHUB_WORKSPACE -G Ninja -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        cmake \
+          -S $GITHUB_WORKSPACE \
+          -B $GITHUB_WORKSPACE/build \
+          -G Ninja \
+          -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
     - name: Build
       run: |
-        cmake --build $GITHUB_WORKSPACE --config $BUILD_TYPE
+        cmake \
+          --build $GITHUB_WORKSPACE/build \
+          --config $BUILD_TYPE
 
     - name: Test
       run: |
-        ctest $GITHUB_WORKSPACE -C $BUILD_TYPE --output-on-failure \
+        ctest \
+          --test-dir $GITHUB_WORKSPACE/build \
+          -C $BUILD_TYPE \
+          --output-on-failure \
           -R SapiTest