Skip to content

CI: compile-queries: use cache when running on main, and support more base-branches #11180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erik-krogh merged 10 commits into from
Nov 9, 2022
Merged

CI: compile-queries: use cache when running on main, and support more base-branches #11180

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
484dc4a
restore from another cache when running on main. Otherwise that workf…
erik-krogh Nov 9, 2022
aede9c3
support general base-branches, not just main
erik-krogh Nov 9, 2022
b3b13bd
use base_ref to calculate the cache-keys when running in a PR.
erik-krogh Nov 9, 2022
f0b09ee
fallback to main
erik-krogh Nov 9, 2022
53917e5
add refs/heads/ to make the ref fully-formed
erik-krogh Nov 9, 2022
1b96538
do a quicker merge-base calculation
erik-krogh Nov 9, 2022
7e52277
simplify the cache keys
erik-krogh Nov 9, 2022
8d51aaa
add another fallback to main
erik-krogh Nov 9, 2022
57ad491
adjust the triggers, run on all PRs, and more branches
erik-krogh Nov 9, 2022
5ba694e
remember to run on PRs
erik-krogh Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .github/workflows/compile-queries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,25 @@ name: "Compile all queries using the latest stable CodeQL CLI"

on:
push:
branches: [main] # makes sure the cache gets populated
pull_request:
branches:
branches: # makes sure the cache gets populated - running on the branches people tend to merge into.
- main
- "rc/*"
- "codeql-cli-*"
pull_request:

jobs:
compile-queries:
runs-on: ubuntu-latest-xl

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
# calculate the merge-base with main, in a way that works both on PRs and pushes to main.
- name: Calculate merge-base
if: ${{ github.event_name == 'pull_request' }}
env:
BASE_BRANCH: ${{ github.base_ref }}
run: |
MERGE_BASE=$(git merge-base --fork-point origin/$BASE_BRANCH)
MERGE_BASE=$(git cat-file commit $GITHUB_SHA | grep '^parent ' | head -1 | cut -f 2 -d " ")
echo "merge-base=$MERGE_BASE" >> $GITHUB_ENV
- name: Read CodeQL query compilation - PR
if: ${{ github.event_name == 'pull_request' }}
Expand All @@ -31,14 +29,18 @@ jobs:
path: '*/ql/src/.cache'
key: codeql-compile-pr-${{ github.sha }} # deliberately not using the `compile-compile-main` keys here.
restore-keys: |
codeql-compile-main-${{ env.merge-base }}
codeql-compile-${{ github.base_ref }}-${{ env.merge-base }}
codeql-compile-${{ github.base_ref }}-
codeql-compile-main-
- name: Fill CodeQL query compilation cache - main
if: ${{ github.event_name != 'pull_request' }}
uses: actions/cache@v3
with:
path: '*/ql/src/.cache'
key: codeql-compile-main-${{ github.sha }} # just fill on main
key: codeql-compile-${{ github.ref_name }}-${{ github.sha }} # just fill on main
restore-keys: | # restore from another random commit, to speed up compilation.
codeql-compile-${{ github.ref_name }}-
codeql-compile-main-
- name: Setup CodeQL
uses: ./.github/actions/fetch-codeql
with:
Expand Down