diff --git a/.github/actions/composite/setup-cache/action.yml b/.github/actions/composite/setup-cache/action.yml deleted file mode 100644 index ff478ea80..000000000 --- a/.github/actions/composite/setup-cache/action.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Set up Keyed Cache -description: Set up Keyed Cache - -runs: - using: composite - steps: - - name: Get Date for cache keying - id: get-date - run: | - echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT - shell: bash - - - name: Set up cache - uses: actions/cache@v4.0.0 - with: - path: ${{ env.CCACHE_BASEDIR }} - key: "${{ runner.os }}-${{ env.SCRIPT_NAME }}-${{ steps.get-date.outputs.date }}" - restore-keys: | - ${{ runner.os }}-${{ env.SCRIPT_NAME }}- diff --git a/.github/workflows/bedrock.yml b/.github/workflows/bedrock.yml index 78d9eb284..a2f2e85de 100644 --- a/.github/workflows/bedrock.yml +++ b/.github/workflows/bedrock.yml @@ -1,4 +1,4 @@ -name: Auth Test Suite +name: Bedrock Test Suite on: push: branches: # this ignores tag pushes, and only looks at branches. @@ -12,9 +12,6 @@ env: CCACHE_BASEDIR: "/home/runner/.cache/ccache" # Use mirror.bastion1.sjc if running locally APT_MIRROR_URL: "apt-mirror.expensify.com:843" - TRAVIS_COMMIT: ${{ github.sha }} - TRAVIS_TAG: ${{ github.ref }} - TRAVIS_BRANCH: ${{ github.ref_name }} CXX: g++-13 CC=gcc-13 jobs: Run_Bedrock_Tests: @@ -74,13 +71,13 @@ jobs: with: limit-access-to-actor: true - # If tmate was run, we want to mark this step as failed so auth tests don't look like they're passing + # If tmate was run, we want to mark this step as failed so bedrock tests don't look like they're passing - name: Mark failure if debugging if: runner.debug == '1' run: exit 1 - name: Run tests - run: "./travis.sh" + run: "./ci_tests.sh" - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15 env: diff --git a/travis.sh b/travis.sh deleted file mode 100755 index 92dc0228d..000000000 --- a/travis.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -set -e - -export CXX=g++-13 -export CC=gcc-13 - -# Add the current working directory to $PATH so that tests can find bedrock. -export PATH=$PATH:`pwd` - -export CCACHE_COMPILERCHECK="mtime" - -# We have include_file_ctime and include_file_mtime since travis never modifies the header file during execution -# and travis shouldn't care about ctime and mtime between new branches. -export CCACHE_SLOPPINESS="pch_defines,time_macros,include_file_ctime,include_file_mtime" -export CCACHE_MAXSIZE="1G" - -# ccache recommends a compression level of 5 or less for faster compilations. -# Compression speeds up the tar and untar of the cache between travis runs. -export CCACHE_COMPRESS="true" -export CCACHE_COMPRESSLEVEL="1" - -mark_fold() { - local action=$1 - local name=$2 - - # if action == end, just print out ::endgroup:: - if [[ "$action" == "end" ]]; then - echo ::endgroup:: - return - fi - - echo "::group::${name}" -} - -# don't print out versions until after they are installed -${CC} --version -${CXX} --version - -mark_fold start build_bedrock -make -j64 -mark_fold end build_bedrock - -mark_fold start test_bedrock -cd test -./test -threads 64 -cd .. -mark_fold end test_bedrock - -mark_fold start test_bedrock_cluster -cd test/clustertest -./clustertest -threads 8 -cd ../.. -mark_fold end test_bedrock_cluster - -strip bedrock