Skip to content

Commit acea409

Browse files
authored
Merge branch 'main' into min-versions
2 parents dc4b399 + 897fefa commit acea409

File tree

130 files changed

+2445
-1203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+2445
-1203
lines changed

.github/actions/build-prql-python/action.yaml

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: build-wheel
22
description:
3-
"Use maturin to build python dists of prql-python. Conditional if checks
3+
"Use maturin to build python dists of prql-python. Conditional `if` checks
44
ensure only the correct OS build is called."
55
inputs:
66
target:
@@ -10,13 +10,7 @@ inputs:
1010
runs:
1111
using: composite
1212
steps:
13-
- run: ./.github/set_version.sh
14-
shell: bash
15-
- uses: Swatinem/rust-cache@v2
16-
with:
17-
save-if: ${{ github.ref == 'refs/heads/main' }}
18-
prefix-key: ${{ env.version }}
19-
shared-key: python
13+
# There's no point caching here, because the maturin action uses a container.
2014
- uses: messense/maturin-action@v1
2115
if: inputs.target == 'source'
2216
with:

.github/workflows/build-devcontainer.yaml

+6-10
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,15 @@ on:
1212
type: boolean
1313
default: false
1414

15-
concurrency:
16-
group: ${{ github.workflow }}-${{ github.ref }}
17-
cancel-in-progress: true
18-
1915
jobs:
2016
build:
2117
runs-on: ubuntu-latest
2218
timeout-minutes: 3600
2319
steps:
2420
- name: 📂 Checkout code
25-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2622

27-
- uses: docker/metadata-action@v4
23+
- uses: docker/metadata-action@v5
2824
id: meta
2925
with:
3026
images: ghcr.io/${{ github.repository_owner }}/prql-devcontainer-base
@@ -33,24 +29,24 @@ jobs:
3329
type=raw,latest
3430
3531
- name: Login to GitHub Container Registry
36-
uses: docker/login-action@v2
32+
uses: docker/login-action@v3
3733
with:
3834
registry: ghcr.io
3935
username: ${{ github.repository_owner }}
4036
password: ${{ secrets.GITHUB_TOKEN }}
4137

4238
- name: Set up QEMU
43-
uses: docker/setup-qemu-action@v2
39+
uses: docker/setup-qemu-action@v3
4440

4541
- name: Set up Docker Buildx
46-
uses: docker/setup-buildx-action@v2
42+
uses: docker/setup-buildx-action@v3
4743

4844
- name: Prep args
4945
run: |
5046
echo "cargo_crates=$(yq -r '.vars.cargo_crates' Taskfile.yml)" >>"$GITHUB_ENV"
5147
5248
- name: Build
53-
uses: docker/build-push-action@v4
49+
uses: docker/build-push-action@v5
5450
timeout-minutes: 3600
5551
with:
5652
context: .devcontainer/base-image

.github/workflows/build-web.yaml

+1-6
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ env:
1010
RUSTFLAGS: "-C debuginfo=0"
1111
RUSTDOCFLAGS: "-Dwarnings"
1212

13-
concurrency:
14-
# See notes in `tests.yaml`
15-
group: ${{ github.workflow }}-${{ github.ref }}-web
16-
cancel-in-progress: true
17-
1813
jobs:
1914
build-web:
2015
runs-on: ubuntu-latest
@@ -26,7 +21,7 @@ jobs:
2621

2722
steps:
2823
- name: 📂 Checkout code
29-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
3025

3126
# Website requires hugo
3227
- name: Setup hugo

.github/workflows/lint-megalinter.yaml

+3-7
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@ env: # Comment env block if you do not want to apply fixes
1515
APPLY_FIXES_EVENT: pull_request # Decide which event triggers application of fixes in a commit or a PR (pull_request, push, all)
1616
APPLY_FIXES_MODE: commit # If APPLY_FIXES is used, defines if the fixes are directly committed (commit) or posted in a PR (pull_request)
1717

18-
concurrency:
19-
group: ${{ github.ref }}-${{ github.workflow }}
20-
cancel-in-progress: true
21-
2218
jobs:
2319
build:
2420
name: lint-megalinter
2521
runs-on: ubuntu-latest
2622
steps:
27-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2824
with:
2925
fetch-depth: 0 # If you use VALIDATE_ALL_CODEBASE = true, you can remove this line to improve performances
3026

@@ -33,7 +29,7 @@ jobs:
3329
id: ml
3430
# You can override MegaLinter flavor used to have faster performances
3531
# More info at https://megalinter.io/flavors/
36-
uses: oxsecurity/megalinter@v7.3.0
32+
uses: oxsecurity/megalinter@v7.4.0
3733
env:
3834
# All available variables are described in documentation
3935
# https://megalinter.io/configuration/
@@ -44,7 +40,7 @@ jobs:
4440

4541
# Upload MegaLinter artifacts
4642
- name: Archive production artifacts
47-
if: ${{ success() }} || ${{ failure() }}
43+
if: always()
4844
uses: actions/upload-artifact@v3
4945
with:
5046
name: MegaLinter reports

.github/workflows/nightly.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434
checks: write
3535

3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
- uses: rustsec/audit-check@v1
3939
with:
4040
token: ${{ secrets.GITHUB_TOKEN }}
4141

4242
cargo-bench:
4343
runs-on: ubuntu-latest
4444
steps:
45-
- uses: actions/checkout@v3
45+
- uses: actions/checkout@v4
4646
- uses: richb-hanover/[email protected]
4747
with:
4848
command: bench
@@ -55,7 +55,7 @@ jobs:
5555
use_cache: [true, false]
5656
steps:
5757
- name: 📂 Checkout code
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959
- uses: ./.github/actions/time-compilation
6060
with:
6161
use_cache: ${{ matrix.use_cache }}
@@ -72,7 +72,7 @@ jobs:
7272
# default to run on. The minimum is defined by Cargo.toml's metadata.msrv.
7373
steps:
7474
- name: 📂 Checkout code
75-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7676
- uses: a-kenji/update-rust-toolchain@main
7777
with:
7878
# Discussion in #1561
@@ -84,7 +84,7 @@ jobs:
8484
runs-on: ubuntu-latest
8585
steps:
8686
- name: 📂 Checkout code
87-
uses: actions/checkout@v3
87+
uses: actions/checkout@v4
8888
- run: rustup override set nightly-2023-04-22
8989
- uses: baptiste0928/cargo-install@v2
9090
with:
@@ -107,7 +107,7 @@ jobs:
107107
# runs-on: ubuntu-latest
108108
# steps:
109109
# - name: 📂 Checkout code
110-
# uses: actions/checkout@v3
110+
# uses: actions/checkout@v4
111111

112112
# - uses: docker/setup-buildx-action@v2
113113

@@ -146,7 +146,7 @@ jobs:
146146

147147
steps:
148148
- name: Checkout repository
149-
uses: actions/checkout@v3
149+
uses: actions/checkout@v4
150150

151151
# Initializes the CodeQL tools for scanning.
152152
- name: Initialize CodeQL

.github/workflows/release.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
target: x86_64-pc-windows-msvc
5252
steps:
5353
- name: 📂 Checkout code
54-
uses: actions/checkout@v3
54+
uses: actions/checkout@v4
5555
- uses: ./.github/actions/build-prqlc
5656
id: build-artifact
5757
with:
@@ -84,7 +84,7 @@ jobs:
8484
runs-on: ubuntu-latest
8585
steps:
8686
- name: 📂 Checkout code
87-
uses: actions/checkout@v3
87+
uses: actions/checkout@v4
8888
- name: 👷 Build prql-compiler
8989
run: cargo build --release
9090
- name: Copy files into .deb package
@@ -111,7 +111,7 @@ jobs:
111111
runs-on: ubuntu-latest
112112
steps:
113113
- name: 📂 Checkout code
114-
uses: actions/checkout@v3
114+
uses: actions/checkout@v4
115115
- name: 👷 Build prqlc
116116
run: cargo build --bin prqlc --release
117117
- name: Copy files into .rpm package
@@ -141,7 +141,7 @@ jobs:
141141
if: ${{ github.event_name == 'release' }}
142142
steps:
143143
- name: 📂 Checkout code
144-
uses: actions/checkout@v3
144+
uses: actions/checkout@v4
145145
- name: Move Snap to project root directory
146146
run: cp -r packages/snap/ .
147147
- name: 📦 Build Snap
@@ -172,7 +172,7 @@ jobs:
172172
target: source
173173
steps:
174174
- name: 📂 Checkout code
175-
uses: actions/checkout@v3
175+
uses: actions/checkout@v4
176176
- uses: ./.github/actions/build-prql-python
177177
with:
178178
target: ${{ matrix.target }}
@@ -197,7 +197,7 @@ jobs:
197197
runs-on: ubuntu-latest
198198
steps:
199199
- name: 📂 Checkout code
200-
uses: actions/checkout@v3
200+
uses: actions/checkout@v4
201201
- uses: baptiste0928/cargo-install@v2
202202
with:
203203
crate: wasm-pack
@@ -219,7 +219,7 @@ jobs:
219219
runs-on: ubuntu-latest
220220
steps:
221221
- name: 📂 Checkout code
222-
uses: actions/checkout@v3
222+
uses: actions/checkout@v4
223223
- uses: baptiste0928/cargo-install@v2
224224
with:
225225
crate: cargo-release
@@ -237,7 +237,7 @@ jobs:
237237
# runs-on: ubuntu-latest
238238
# steps:
239239
# - name: Checkout code
240-
# uses: actions/checkout@v3
240+
# uses: actions/checkout@v4
241241
# - name: Install Java and Maven
242242
# uses: actions/setup-java@v3
243243
# with:
@@ -256,7 +256,7 @@ jobs:
256256
if: github.event_name == 'release'
257257
steps:
258258
- name: 📂 Checkout code
259-
uses: actions/checkout@v3
259+
uses: actions/checkout@v4
260260
- run: git push origin HEAD:web --force
261261

262262
push-devcontainer:

.github/workflows/test-dotnet.yaml

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@ on:
44
workflow_call:
55
workflow_dispatch:
66

7-
concurrency:
8-
# See notes in `tests.yaml`
9-
group: ${{ github.workflow }}-${{ github.ref }}-dotnet
10-
cancel-in-progress: true
11-
127
jobs:
138
test:
149
runs-on: ubuntu-latest
1510
steps:
1611
- name: 📂 Checkout code
17-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1813
- name: 🏗 Build prql-lib
1914
run: cargo build
2015
working-directory: bindings/prql-lib

.github/workflows/test-elixir.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ on:
1212
type: string
1313
default: '["ubuntu-latest"]'
1414

15-
concurrency:
16-
group: ${{ github.workflow }}-${{ github.ref }}-elixir
17-
cancel-in-progress: true
18-
1915
defaults:
2016
run:
2117
working-directory: bindings/prql-elixir
@@ -34,7 +30,7 @@ jobs:
3430
steps:
3531
# Step: Check out the code.
3632
- name: Checkout code
37-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3834

3935
# Step: Setup Elixir + Erlang image as the base.
4036
- name: Set up Elixir on Windows or Linux

.github/workflows/test-java.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ on:
1212
type: string
1313
default: '["ubuntu-latest"]'
1414

15-
concurrency:
16-
group: ${{ github.workflow }}-${{ github.ref }}-java
17-
cancel-in-progress: true
18-
1915
jobs:
2016
test:
2117
runs-on: ${{ matrix.os }}
@@ -24,7 +20,7 @@ jobs:
2420
os: ${{ fromJSON(inputs.oss) }}
2521
steps:
2622
- name: Checkout code
27-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2824
- run: ./.github/set_version.sh
2925
- name: 💰 Cache
3026
uses: Swatinem/rust-cache@v2

.github/workflows/test-js.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ env:
1818
RUSTFLAGS: "-C debuginfo=0"
1919
RUSTDOCFLAGS: "-Dwarnings"
2020

21-
concurrency:
22-
group: ${{ github.workflow }}-${{ github.ref }}-js
23-
cancel-in-progress: true
24-
2521
jobs:
2622
test:
2723
runs-on: ${{ matrix.os }}
@@ -30,7 +26,7 @@ jobs:
3026
os: ${{ fromJSON(inputs.oss) }}
3127
steps:
3228
- name: 📂 Checkout code
33-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3430

3531
- name: Setup Node
3632
uses: actions/setup-node@v3

.github/workflows/test-lib.yaml

+2-7
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@ on:
44
workflow_call:
55
workflow_dispatch:
66

7-
concurrency:
8-
# See notes in `tests.yaml`
9-
group: ${{ github.workflow }}-${{ github.ref }}-lib
10-
cancel-in-progress: true
11-
127
jobs:
138
test-lib:
149
runs-on: ubuntu-latest
1510
steps:
1611
- name: 📂 Checkout code
17-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1813
- run: ./.github/set_version.sh
1914
- name: 💰 Cache
2015
uses: Swatinem/rust-cache@v2
@@ -38,7 +33,7 @@ jobs:
3833
runs-on: ubuntu-latest
3934
steps:
4035
- name: 📂 Checkout code
41-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
4237
- run: ./.github/set_version.sh
4338
- name: 💰 Cache
4439
uses: Swatinem/rust-cache@v2

0 commit comments

Comments
 (0)