- Notifications
You must be signed in to change notification settings - Fork 15.3k
[workflows] Port buildkite Windows config to GitHub actions #82093
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.
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
Open
tstellar wants to merge 4 commits into llvm:main Choose a base branch from tstellar:buildkite-gh-pr
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits Select commit Hold shift + click to select a range
3093657 [workflows] Port buildkite Windows config to GitHub actions
tstellar 673c078 Workflow improvements:
tstellar 9e9aee1 Automatically continue the CI job when it times out
tstellar a7ff883 Re-write continue-timeout-job to be more generic
tstellar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: 'Compute Projects To Test' | ||
| inputs: | ||
| projects: | ||
| required: false | ||
| type: 'string' | ||
| | ||
| outputs: | ||
| check-targets: | ||
| description: "A space delimited list of check-targets to pass to ninja." | ||
| value: ${{ steps.compute-projects.outputs.check-targets }} | ||
| | ||
| projects: | ||
| description: "A semi-colon delimited list of projects to pass to -DLLVM_ENABLE_PROJECTS." | ||
| value: ${{ steps.compute-projects.outputs.projects }} | ||
| | ||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - id: compute-projects | ||
| run: .github/workflows/compute-projects-to-test/compute-projects-to-test.sh ${{ inputs.projects }} | ||
| shell: bash |
221 changes: 221 additions & 0 deletions 221 .github/workflows/compute-projects-to-test/compute-projects-to-test.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,221 @@ | ||||||||
| #!/usr/bin/env bash | ||||||||
| #===----------------------------------------------------------------------===## | ||||||||
| # | ||||||||
| # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||||||||
| # See https://llvm.org/LICENSE.txt for license information. | ||||||||
| # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||||||||
| # | ||||||||
| #===----------------------------------------------------------------------===## | ||||||||
| | ||||||||
| # | ||||||||
| # This file generates a Buildkite pipeline that triggers the various CI jobs for | ||||||||
| # the LLVM project during pre-commit CI. | ||||||||
| # | ||||||||
| # See https://buildkite.com/docs/agent/v3/cli-pipeline#pipeline-format. | ||||||||
| # | ||||||||
| # As this outputs a yaml file, it's possible to log messages to stderr or | ||||||||
| # prefix with "#". | ||||||||
| | ||||||||
| | ||||||||
| set -eu | ||||||||
| set -o pipefail | ||||||||
| | ||||||||
| # Environment variables script works with: | ||||||||
| | ||||||||
| # Set by GitHub | ||||||||
| : ${GITHUB_OUTPUT:=} | ||||||||
| : ${RUNNER_OS:=} | ||||||||
| | ||||||||
| # Allow users to specify which projects to build. | ||||||||
| all_projects="bolt clang clang-tools-extra compiler-rt cross-project-tests flang libc libclc lld lldb llvm mlir openmp polly pstl" | ||||||||
| if [ "$#" -ne 0 ]; then | ||||||||
| wanted_projects="${@}" | ||||||||
| else | ||||||||
| wanted_projects="${all_projects}" | ||||||||
| fi | ||||||||
| | ||||||||
| # List of files affected by this commit | ||||||||
| : ${MODIFIED_FILES:=$(git diff --name-only HEAD~1...HEAD)} | ||||||||
| | ||||||||
| echo "Files modified:" >&2 | ||||||||
| echo "$MODIFIED_FILES" >&2 | ||||||||
| modified_dirs=$(echo "$MODIFIED_FILES" | cut -d'/' -f1 | sort -u) | ||||||||
| echo "Directories modified:" >&2 | ||||||||
| echo "$modified_dirs" >&2 | ||||||||
| echo "wanted_projects: $wanted_projects" | ||||||||
| | ||||||||
| function remove-unwanted-projects() { | ||||||||
| projects=${@} | ||||||||
| for project in ${projects}; do | ||||||||
| if echo "$wanted_projects" | tr ' ' '\n' | grep -q -E "^${project}$"; then | ||||||||
| echo "${project}" | ||||||||
| fi | ||||||||
| done | ||||||||
| } | ||||||||
| | ||||||||
| function compute-projects-to-test() { | ||||||||
| projects=${@} | ||||||||
| for project in ${projects}; do | ||||||||
| echo "${project}" | ||||||||
| case ${project} in | ||||||||
| lld) | ||||||||
| for p in bolt cross-project-tests; do | ||||||||
| echo $p | ||||||||
| done | ||||||||
| ;; | ||||||||
| llvm) | ||||||||
| for p in bolt clang clang-tools-extra flang lld lldb mlir polly; do | ||||||||
| echo $p | ||||||||
| done | ||||||||
| ;; | ||||||||
| clang) | ||||||||
| for p in clang-tools-extra compiler-rt flang libc lldb openmp cross-project-tests; do | ||||||||
| echo $p | ||||||||
| done | ||||||||
| ;; | ||||||||
| clang-tools-extra) | ||||||||
| echo libc | ||||||||
| ;; | ||||||||
| mlir) | ||||||||
| echo flang | ||||||||
| ;; | ||||||||
| *) | ||||||||
| # Nothing to do | ||||||||
| ;; | ||||||||
| esac | ||||||||
| done | ||||||||
| } | ||||||||
| | ||||||||
| function add-dependencies() { | ||||||||
| projects=${@} | ||||||||
joker-eph marked this conversation as resolved. Show resolved Hide resolved | ||||||||
| for project in ${projects}; do | ||||||||
| echo "${project}" | ||||||||
| case ${project} in | ||||||||
| bolt) | ||||||||
| for p in lld llvm; do | ||||||||
| echo $p | ||||||||
| done | ||||||||
| ;; | ||||||||
| cross-project-tests) | ||||||||
| for p in lld clang; do | ||||||||
| echo $p | ||||||||
| done | ||||||||
| ;; | ||||||||
| clang-tools-extra) | ||||||||
| for p in llvm clang; do | ||||||||
| echo $p | ||||||||
| done | ||||||||
| ;; | ||||||||
| compiler-rt|libc|openmp) | ||||||||
| echo clang lld | ||||||||
| ;; | ||||||||
| flang|lldb) | ||||||||
| for p in llvm clang; do | ||||||||
| echo $p | ||||||||
| done | ||||||||
| ;; | ||||||||
| lld|mlir|polly) | ||||||||
| echo llvm | ||||||||
| ;; | ||||||||
| *) | ||||||||
| # Nothing to do | ||||||||
| ;; | ||||||||
| esac | ||||||||
| done | ||||||||
| } | ||||||||
| | ||||||||
| function exclude-linux() { | ||||||||
| projects=${@} | ||||||||
| for project in ${projects}; do | ||||||||
| case ${project} in | ||||||||
| cross-project-tests) ;; # tests failing | ||||||||
| lldb) ;; # tests failing | ||||||||
| openmp) ;; # https://github.com/google/llvm-premerge-checks/issues/410 | ||||||||
| *) | ||||||||
| echo "${project}" | ||||||||
| ;; | ||||||||
| esac | ||||||||
| done | ||||||||
| } | ||||||||
| | ||||||||
| function exclude-windows() { | ||||||||
| projects=${@} | ||||||||
| for project in ${projects}; do | ||||||||
| case ${project} in | ||||||||
| cross-project-tests) ;; # tests failing | ||||||||
| compiler-rt) ;; # tests taking too long | ||||||||
| openmp) ;; # TODO: having trouble with the Perl installation | ||||||||
| libc) ;; # no Windows support | ||||||||
| lldb) ;; # tests failing | ||||||||
| bolt) ;; # tests are not supported yet | ||||||||
| *) | ||||||||
| echo "${project}" | ||||||||
| ;; | ||||||||
| esac | ||||||||
| done | ||||||||
| } | ||||||||
| | ||||||||
| # Prints only projects that are both present in $modified_dirs and the passed | ||||||||
| # list. | ||||||||
| function keep-modified-projects() { | ||||||||
| projects=${@} | ||||||||
| for project in ${projects}; do | ||||||||
| if echo "$modified_dirs" | grep -q -E "^${project}$"; then | ||||||||
| echo "${project}" | ||||||||
| fi | ||||||||
| done | ||||||||
| } | ||||||||
| | ||||||||
| function check-targets() { | ||||||||
| projects=${@} | ||||||||
| for project in ${projects}; do | ||||||||
| case ${project} in | ||||||||
| clang-tools-extra) | ||||||||
| echo "check-clang-tools" | ||||||||
| ;; | ||||||||
| compiler-rt) | ||||||||
| echo "check-all" | ||||||||
| ;; | ||||||||
| cross-project-tests) | ||||||||
| echo "check-cross-project" | ||||||||
| ;; | ||||||||
| lldb) | ||||||||
| echo "check-all" # TODO: check-lldb may not include all the LLDB tests? | ||||||||
| ;; | ||||||||
| pstl) | ||||||||
| echo "check-all" | ||||||||
| ;; | ||||||||
| libclc) | ||||||||
| echo "check-all" | ||||||||
| ;; | ||||||||
| *) | ||||||||
| echo "check-${project}" | ||||||||
| ;; | ||||||||
| esac | ||||||||
| done | ||||||||
| } | ||||||||
| | ||||||||
| # Generic pipeline for projects that have not defined custom steps. | ||||||||
| # | ||||||||
| # Individual projects should instead define the pre-commit CI tests that suits their | ||||||||
| # needs while letting them run on the infrastructure provided by LLVM. | ||||||||
| | ||||||||
| # Figure out which projects need to be built on each platform | ||||||||
| modified_projects="$(keep-modified-projects ${all_projects})" | ||||||||
| echo "modified_projects: $modified_projects" | ||||||||
| | ||||||||
| if [ "${RUNNER_OS}" = "Linux" ]; then | ||||||||
| projects_to_test=$(exclude-linux $(compute-projects-to-test ${modified_projects})) | ||||||||
| elif [ "${RUNNER_OS}" = "Windows" ]; then | ||||||||
| projects_to_test=$(exclude-windows $(compute-projects-to-test ${modified_projects})) | ||||||||
| Collaborator There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Suggested change
| ||||||||
| else | ||||||||
| echo "Unknown runner OS: $RUNNER_OS" | ||||||||
| Collaborator There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we should exit with an error here: Suggested change
Collaborator There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ping | ||||||||
| exit 1 | ||||||||
| fi | ||||||||
| check_targets=$(check-targets $(remove-unwanted-projects ${projects_to_test}) | sort | uniq) | ||||||||
| projects=$(remove-unwanted-projects $(add-dependencies ${projects_to_test}) | sort | uniq) | ||||||||
| | ||||||||
| echo "check-targets=$(echo ${check_targets} | tr ' ' ' ')" >> $GITHUB_OUTPUT | ||||||||
| echo "projects=$(echo ${projects} | tr ' ' ';')" >> $GITHUB_OUTPUT | ||||||||
| | ||||||||
| cat $GITHUB_OUTPUT | ||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| name: Continue Timeout Job | ||
| | ||
| on: | ||
| workflow_run: | ||
| workflows: | ||
| - "Windows Precommit Tests" | ||
| types: | ||
| - completed | ||
| | ||
| permissions: | ||
| contents: read | ||
| | ||
| jobs: | ||
| restart: | ||
| name: "Restart Job" | ||
| permissions: | ||
| actions: write | ||
| runs-on: ubuntu-22.04 | ||
| if: github.event.workflow_run.conclusion == 'failure' | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| sparse-checkout: | | ||
| .github/workflows/unprivileged-download-artifact | ||
| sparse-checkout-cone-mode: false | ||
| | ||
| - uses: ./.github/workflows/unprivileged-download-artifact | ||
| id: download-artifact | ||
| with: | ||
| run-id: ${{ github.event.workflow_run.id }} | ||
| artifact-name: timeout | ||
| | ||
| - shell: bash | ||
| if: steps.download-artifact.outputs.filename != '' | ||
| run: | | ||
| unzip ${{ steps.download-artifact.outputs.filename }} | ||
| | ||
| - name: "Restart Job" | ||
| if: steps.download-artifact.outputs.filename != '' | ||
| uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1 | ||
| with: | ||
| script: | | ||
| var fs = require('fs'); | ||
| const data = fs.readFileSync('./timeout'); | ||
| console.log(data); | ||
| const json = JSON.parse(data); | ||
| console.log(json); | ||
| if (!json || !json.job_id) { | ||
| console.log("Could not parse timeout artifact"); | ||
| return; | ||
| } | ||
| const job_id = json.job_id | ||
| | ||
| // Delete the timeout artifact to prepare for the next run | ||
| await github.rest.actions.deleteArtifact({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| artifact_id: ${{ steps.download-artifact.outputs.artifact-id }} | ||
| }) | ||
| | ||
| // Restart the job | ||
| // This function does not exist even though it is in the document | ||
| //github.rest.actions.reRunJobForWorkflow({ | ||
| await github.request('POST /repos/{owner}/{repo}/actions/jobs/{job_id}/rerun', { | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| job_id: job_id | ||
| }) | ||
| console.log("Restarted job: " + job_id); | ||
| return "timeout" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| name: Get Job ID | ||
| inputs: | ||
| job-name: | ||
| required: false | ||
| type: 'string' | ||
| | ||
| outputs: | ||
| job-id: | ||
| description: "A space delimited list of check-targets to pass to ninja." | ||
| value: ${{ steps.job-id.outputs.result }} | ||
| | ||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1 | ||
| id: job-id | ||
| with: | ||
| script: | | ||
| const job_data = await github.rest.actions.listJobsForWorkflowRun({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| run_id: context.runId, | ||
| }); | ||
| | ||
| for (job of job_data.data.jobs) { | ||
| console.log(job) | ||
| if (job.name == "${{ inputs.job-name }}") { | ||
| return job.id | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| name: PR sccache restore | ||
| | ||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - uses: ./.github/workflows/unprivileged-download-artifact | ||
| id: download-artifact | ||
| with: | ||
| run-id: ${{ github.run_id }} | ||
| artifact-name: sccache-pr${{ github.event.pull_request.number }} | ||
| | ||
| - shell: bash | ||
| if: steps.download-artifact.outputs.filename != '' | ||
| run: | | ||
| # Is this the best way to clear the cache? | ||
| rm -Rf .sccache/ | ||
| unzip ${{ steps.download-artifact.outputs.filename }} | ||
| rm ${{ steps.download-artifact.outputs.filename }} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does this work, when a branch contains multiple commits (e.g. an original one and multiple corrections/tweaks) - essentially we should check the diff of the whole branch, right?
But when doing that, we also need to make sure that we ignore any changes from merge commits, like in llvm/llvm-admin#8, otherwise we will essentially end up testing every single subproject as soon as an MR contains a merge commit. IIRC
git diff <base>...HEADis the syntax for that, but it's worth testing and looking into.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The HEAD commit for a PR is a merge of the PR branch into main. It's not the HEAD for the PR target branch. In my testing using HEAD~1...HEAD worked for multiple commits. I did not test the case where the PR branch had a merge commit in it already. I can test
git diff <base>...HEAD