diff --git a/mps/.github/workflows/c-cpp.yml b/mps/.github/workflows/build-and-test.yml similarity index 91% rename from mps/.github/workflows/c-cpp.yml rename to mps/.github/workflows/build-and-test.yml index 5ab80fa7faa..46880674cf2 100644 --- a/mps/.github/workflows/c-cpp.yml +++ b/mps/.github/workflows/build-and-test.yml @@ -1,15 +1,15 @@ -# .github/workflows/c-cpp.yml +# .github/workflows/build-and-test.yml # # GitHub CI # # Adapted from -name: C/C++ CI +name: build and test on: - push - pull_request - # Also run when triggered manually + # Also run when triggered manually, e.g. by tool/github-ci-kick # - workflow_dispatch diff --git a/mps/.travis.yml b/mps/.travis.yml index 56ac2d83f50..e123891ddc1 100644 --- a/mps/.travis.yml +++ b/mps/.travis.yml @@ -18,7 +18,7 @@ os: # - osx # See "include" section for Windows arch: - # Most amd64 builds moved to GitHub CI. See .github/workflows/c-cpp.yml. + # Most amd64 builds moved to GitHub CI. See .github/workflows/build-and-test.yml. # - amd64 - arm64 compiler: diff --git a/mps/tool/github-ci-kick b/mps/tool/github-ci-kick index 8285693a9f0..b313da20cb2 100755 --- a/mps/tool/github-ci-kick +++ b/mps/tool/github-ci-kick @@ -7,7 +7,7 @@ # This shell script uses the GitHub REST API to kick off a build on # the GitHub CI servers [GITHUB]. The build will be run using the # GitHub CI configuration at the commit (in -# .github/workflows/c-cpp.yml). +# .github/workflows/build-and-test.yml). # # See also tool/travis-ci-kick. # @@ -68,7 +68,7 @@ curl --silent --show-error \ --header "Accept: application/vnd.github+json" \ --header "Authorization: Bearer ${auth}"\ --header "X-GitHub-Api-Version: 2022-11-28" \ - "https://api.github.com/repos/${org}/${repo}/actions/workflows/c-cpp.yml/dispatches" \ + "https://api.github.com/repos/${org}/${repo}/actions/workflows/build-and-test.yml/dispatches" \ <<-EOF { "ref": "${branch}"