From 86f9d9250d773f45e1fb4c5dff65378058999996 Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Tue, 2 Jul 2024 20:14:07 +0000 Subject: [PATCH 1/3] Use bazel-contrib/setup-bazel instead of manually installing a deb during CI Also fix some EOL whitespace because that's how my vim is configured. --- .github/workflows/bazeltest.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/bazeltest.yml b/.github/workflows/bazeltest.yml index 41e6f0b3..4907848c 100644 --- a/.github/workflows/bazeltest.yml +++ b/.github/workflows/bazeltest.yml @@ -22,12 +22,12 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: bazel-contrib/setup-bazel@0.8.5 + bazelisk-cache: true + disk-cache: ${{ github.workflow }} + repository-cache: true - name: Checkout submodules run: git submodule update --init --recursive - - name: Install Bazel on CI - run: | - wget https://github.com/bazelbuild/bazel/releases/download/5.3.0/bazel_5.3.0-linux-x86_64.deb - sudo dpkg -i bazel_5.3.0-linux-x86_64.deb - name: Install requirements run: | python3 -m pip install -r requirements.txt @@ -51,16 +51,16 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: bazel-contrib/setup-bazel@0.8.5 + bazelisk-cache: true + disk-cache: ${{ github.workflow }} + repository-cache: true - name: Checkout submodules run: git submodule update --init --recursive - - name: Install Bazel on CI - run: | - wget https://github.com/bazelbuild/bazel/releases/download/5.3.0/bazel_5.3.0-linux-x86_64.deb - sudo dpkg -i bazel_5.3.0-linux-x86_64.deb - name: Install requirements run: | python3 -m pip install -r requirements.txt - - name: Upgrade libc + - name: Upgrade libc # An LLVM update broke this test, fix per is https://bugs.llvm.org/show_bug.cgi?id=27310. run: | sudo apt update @@ -69,19 +69,19 @@ jobs: run: | bazel test --config=avx --config=openmp \ --config=${{ matrix.sanitizer_opt }} tests:all - + test-mem: name: Test with tcmalloc runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 + - uses: bazel-contrib/setup-bazel@0.8.5 + bazelisk-cache: true + disk-cache: ${{ github.workflow }} + repository-cache: true - name: Checkout submodules run: git submodule update --init --recursive - - name: Install Bazel on CI - run: | - wget https://github.com/bazelbuild/bazel/releases/download/5.3.0/bazel_5.3.0-linux-x86_64.deb - sudo dpkg -i bazel_5.3.0-linux-x86_64.deb - name: Install requirements run: | python3 -m pip install -r requirements.txt From db188b3b638d7498005b01697cf4967f8f3ca93f Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Tue, 2 Jul 2024 20:29:39 +0000 Subject: [PATCH 2/3] Specify bazelisk-version in case bazelisk isn't installed in the CI container --- .github/workflows/bazeltest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/bazeltest.yml b/.github/workflows/bazeltest.yml index 4907848c..943c0a4c 100644 --- a/.github/workflows/bazeltest.yml +++ b/.github/workflows/bazeltest.yml @@ -26,6 +26,7 @@ jobs: bazelisk-cache: true disk-cache: ${{ github.workflow }} repository-cache: true + bazelisk-version: 1.x - name: Checkout submodules run: git submodule update --init --recursive - name: Install requirements @@ -55,6 +56,7 @@ jobs: bazelisk-cache: true disk-cache: ${{ github.workflow }} repository-cache: true + bazelisk-version: 1.x - name: Checkout submodules run: git submodule update --init --recursive - name: Install requirements @@ -80,6 +82,7 @@ jobs: bazelisk-cache: true disk-cache: ${{ github.workflow }} repository-cache: true + bazelisk-version: 1.x - name: Checkout submodules run: git submodule update --init --recursive - name: Install requirements From 6296de3065076e5cf7441001df1b0b8730f4c36e Mon Sep 17 00:00:00 2001 From: Douglas Thor Date: Tue, 2 Jul 2024 21:27:42 +0000 Subject: [PATCH 3/3] /facepalm forgot the 'with:' --- .github/workflows/bazeltest.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bazeltest.yml b/.github/workflows/bazeltest.yml index 943c0a4c..1a0cf6b0 100644 --- a/.github/workflows/bazeltest.yml +++ b/.github/workflows/bazeltest.yml @@ -23,10 +23,11 @@ jobs: steps: - uses: actions/checkout@v2 - uses: bazel-contrib/setup-bazel@0.8.5 - bazelisk-cache: true - disk-cache: ${{ github.workflow }} - repository-cache: true - bazelisk-version: 1.x + with: + bazelisk-cache: true + disk-cache: ${{ github.workflow }} + repository-cache: true + bazelisk-version: 1.x - name: Checkout submodules run: git submodule update --init --recursive - name: Install requirements @@ -53,10 +54,11 @@ jobs: steps: - uses: actions/checkout@v2 - uses: bazel-contrib/setup-bazel@0.8.5 - bazelisk-cache: true - disk-cache: ${{ github.workflow }} - repository-cache: true - bazelisk-version: 1.x + with: + bazelisk-cache: true + disk-cache: ${{ github.workflow }} + repository-cache: true + bazelisk-version: 1.x - name: Checkout submodules run: git submodule update --init --recursive - name: Install requirements @@ -79,10 +81,11 @@ jobs: steps: - uses: actions/checkout@v2 - uses: bazel-contrib/setup-bazel@0.8.5 - bazelisk-cache: true - disk-cache: ${{ github.workflow }} - repository-cache: true - bazelisk-version: 1.x + with: + bazelisk-cache: true + disk-cache: ${{ github.workflow }} + repository-cache: true + bazelisk-version: 1.x - name: Checkout submodules run: git submodule update --init --recursive - name: Install requirements