Skip to content

Commit

Permalink
Merge branch 'PRQL:main' into adjust-ownership
Browse files Browse the repository at this point in the history
  • Loading branch information
richb-hanover authored Jan 12, 2025
2 parents 8e46b98 + 02e8e58 commit 99fe3ce
Show file tree
Hide file tree
Showing 44 changed files with 662 additions and 287 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint-megalinter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

# You can override MegaLinter flavor used to have faster performances
# More info at https://megalinter.io/flavors/
uses: oxsecurity/megalinter@v8.2.0
uses: oxsecurity/megalinter@v8.3.0

id: ml

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,14 @@ jobs:
#
# Would be better if we could only run when we know we have permissions. But
# this will do...

# 2024-12-09 — this is failing on normal PRs despite clearing the advisories
# in GitHub, and the action is archived. We have the GitHub security audits,
# `prqlc` doesn't cross any trust boundaries, so disabling for the moment.
# We can re-enable if a supported action is available.
if:
${{ github.repository_owner == 'prql' &&
!github.event.pull_request.head.repo.fork }}
!github.event.pull_request.head.repo.fork && 'run' == 'no' }}
permissions:
actions: read
contents: read
Expand Down Expand Up @@ -78,7 +83,7 @@ jobs:
steps:
- name: 📂 Checkout code
uses: actions/checkout@v4
- run: rustup override set nightly-2024-06-30
- run: rustup override set nightly-2025-01-12
- uses: baptiste0928/cargo-install@v3
with:
crate: cargo-udeps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ jobs:
steps:
- name: 📂 Checkout code
uses: actions/checkout@v4
- run: rustup override set nightly-2024-06-30
- run: rustup override set nightly-2025-01-12
- uses: baptiste0928/cargo-install@v3
with:
crate: cargo-hack
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ codecov.json
vendor
.mypy_cache/
.hypothesis/
.aider*
.env
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ repos:
# rustfmt handles rust files, and in some snapshots we expect trailing spaces.
exclude: '.*\.(rs|snap)$'
- repo: https://github.com/crate-ci/typos
rev: typos-dict-v0.11.35
rev: dictgen-v0.3.1
hooks:
- id: typos
# https://github.com/crate-ci/typos/issues/347
pass_filenames: false
- repo: https://github.com/rbubley/mirrors-prettier
rev: v3.3.3
rev: v3.4.2
hooks:
- id: prettier
additional_dependencies:
Expand All @@ -25,13 +25,13 @@ repos:
# https://github.com/PRQL/prql/issues/3078
- prettier-plugin-go-template
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.4
rev: v0.8.6
hooks:
- id: ruff
args: [--fix]
- id: ruff-format
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v19.1.3
rev: v19.1.6
hooks:
- id: clang-format
types_or: [c, c++]
Expand All @@ -45,7 +45,7 @@ repos:
- id: clippy
stages: [manual]
- repo: https://github.com/rhysd/actionlint
rev: v1.7.4
rev: v1.7.6
hooks:
- id: actionlint
- repo: https://github.com/tcort/markdown-link-check
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

**Fixes**:

- Sort steps in sub-pipelines no longer cause a column lookup error
(@lukapeschke, #5066)

**Documentation**:

**Web**:
Expand All @@ -18,6 +21,8 @@

**New Contributors**:

- @lukapeschke, with #5066

## 0.13.2

0.13.2 is a tiny release to fix an issue publishing 0.13.1 to crates.io.
Expand Down Expand Up @@ -1292,8 +1297,8 @@ below in this release).

**Documentation**:

[This release, the changelog only contains a subset of
documentation improvements]
[This release, the changelog only contains a subset of documentation
improvements]

- Add docs on aliases in
[Select](https://prql-lang.org/book/reference/stdlib/transforms/select.html)
Expand Down
Loading

0 comments on commit 99fe3ce

Please sign in to comment.