Skip to content

Commit

Permalink
ci: Rename pull-request.yaml to tests.yaml (#3374)
Browse files Browse the repository at this point in the history
  • Loading branch information
max-sixty authored Aug 22, 2023
1 parent 9c993f7 commit 688d325
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
RUSTFLAGS: "-C debuginfo=0"

concurrency:
# See notes in `pull-request.yaml`
# See notes in `tests.yaml`
group: ${{ github.workflow }}-${{ github.ref }}-web
cancel-in-progress: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# A workflow containing jobs we run only on nightly. This is called by
# `pull-request` on a schedule and on request with `pr-nightly`.
# `tests.yaml` on a schedule and on request with a `pr-nightly` label.

name: nightly

Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
command: bench
args: --timings --all-targets

check-links-markdown:
check-links-markdown-all:
# We run only on modified files and only on our resources in PRs; here we
# run on all links and all files.
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ name: test-all
# to nightly, but I wanted to check with @eitsupi before doing it.

on:
# Called by `pull-request.yaml`
# Called by `tests.yaml`
workflow_call:
workflow_dispatch:

concurrency:
# See notes in `pull-request.yaml`
# See notes in `tests.yaml`
group: ${{ github.workflow }}-${{ github.ref }}-all
cancel-in-progress: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:

concurrency:
# See notes in `pull-request.yaml`
# See notes in `tests.yaml`
group: ${{ github.workflow }}-${{ github.ref }}-dotnet
cancel-in-progress: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-lib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:

concurrency:
# See notes in `pull-request.yaml`
# See notes in `tests.yaml`
group: ${{ github.workflow }}-${{ github.ref }}-lib
cancel-in-progress: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-php.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
workflow_dispatch:

concurrency:
# See notes in `pull-request.yaml`
# See notes in `tests.yaml`
group: ${{ github.workflow }}-${{ github.ref }}-php
cancel-in-progress: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
default: '["ubuntu-latest"]'

concurrency:
# See notes in `pull-request.yaml`
# See notes in `tests.yaml`
group: ${{ github.workflow }}-${{ github.ref }}-python
cancel-in-progress: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-rust.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: test-rust

on:
# Currently we only run this as `workflow_call`, since `pull-request` always calls it.
# Currently we only run this as `workflow_call`, since `tests.yaml` always calls it.
workflow_call:
inputs:
os:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# This file has transitioning to run almost everything, with rules defined in
# this file rather than across lots of workflow files. We can rename it to
# `tests.yaml` or something similarly general at some point.
name: pull-request
# this file rather than across lots of workflow files.
name: tests

on:
pull_request:
Expand All @@ -18,18 +17,8 @@ on:
workflow_call:

concurrency:
# This used to require a custom suffix; I think that can now be removed.
# Previous comment:
#
# # I _think_ because this calls
# # `test-all`, which calls `test-python`, and if `test-python` runs too, then
# # we have two workflows with the same concurrency group, which GitHub calls a
# # deadlock. Here's an example:
# # https://github.com/PRQL/prql/actions/runs/3945798229. By adding
# # `-pull-request` here, the job that runs under `test-all` (called from here)
# # will have the suffix, and so won't deadlock. But I'm not certain, and it
# # doesn't seem possible to inspect these values to understand the true cause.
group: ${{ github.workflow }}-${{ github.ref }}-pull-request
# This used to require a custom suffix; I think the can now be removed...
group: ${{ github.workflow }}-${{ github.ref }}-tests
cancel-in-progress: true

env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- [![Twitter](https://img.shields.io/twitter/follow/prql_lang?color=%231DA1F2&style=for-the-badge)](https://twitter.com/prql_lang) -->
<!-- Dev badges on second line -->

[![GitHub CI Status](https://img.shields.io/github/actions/workflow/status/prql/prql/pull-request.yaml?event=push&branch=main&logo=github&style=for-the-badge)](https://github.com/PRQL/prql/actions?query=branch%3Amain+workflow%3Apull-request)
[![GitHub CI Status](https://img.shields.io/github/actions/workflow/status/prql/prql/tests.yaml?event=push&branch=main&logo=github&style=for-the-badge)](https://github.com/PRQL/prql/actions?query=branch%3Amain+workflow%3Atests)
[![GitHub contributors](https://img.shields.io/github/contributors/PRQL/prql?style=for-the-badge)](https://github.com/PRQL/prql/graphs/contributors)
[![Stars](https://img.shields.io/github/stars/PRQL/prql?style=for-the-badge)](https://github.com/PRQL/prql/stargazers)

Expand Down
6 changes: 3 additions & 3 deletions web/book/src/project/contributing/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ inconsistent in watchexec. Let's revert back if it gets solved.
More details on running with external databases are in the Readme.
- **[GitHub Actions on every commit](https://github.com/PRQL/prql/blob/main/.github/workflows/pull-request.yaml)**
- **[GitHub Actions on every commit](https://github.com/PRQL/prql/blob/main/.github/workflows/tests.yaml)**
— we run tests relevant to a PR's changes in CI — for example changes to docs
will attempt to build docs, changes to a binding will run that binding's
tests. The vast majority of changes trigger tests which run in less than five
Expand All @@ -327,8 +327,8 @@ inconsistent in watchexec. Let's revert back if it gets solved.
- **[GitHub Actions on merge](https://github.com/PRQL/prql/blob/c042eef48709e2c1af577161554fd09f14e67e0f/.github/workflows/pull-request.yaml#L124)**
— we run a wider set tests on every merge to main. This includes testing
across OSs, all our language bindings, our `task` tasks, a measure of test
code coverage, and some performance benchmarks.
across OSs, all our language bindings, a measure of test code coverage, and
some performance benchmarks.
If these tests fail after merging, we should revert the commit before fixing
the test and then re-reverting.
Expand Down

0 comments on commit 688d325

Please sign in to comment.