Skip to content

Commit

Permalink
Merge branch 'main' into min-versions
Browse files Browse the repository at this point in the history
  • Loading branch information
max-sixty authored Oct 6, 2023
2 parents dc4b399 + 897fefa commit acea409
Show file tree
Hide file tree
Showing 130 changed files with 2,445 additions and 1,203 deletions.
10 changes: 2 additions & 8 deletions .github/actions/build-prql-python/action.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: build-wheel
description:
"Use maturin to build python dists of prql-python. Conditional if checks
"Use maturin to build python dists of prql-python. Conditional `if` checks
ensure only the correct OS build is called."
inputs:
target:
Expand All @@ -10,13 +10,7 @@ inputs:
runs:
using: composite
steps:
- run: ./.github/set_version.sh
shell: bash
- uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.ref == 'refs/heads/main' }}
prefix-key: ${{ env.version }}
shared-key: python
# There's no point caching here, because the maturin action uses a container.
- uses: messense/maturin-action@v1
if: inputs.target == 'source'
with:
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/build-devcontainer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,15 @@ on:
type: boolean
default: false

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 3600
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: docker/metadata-action@v4
- uses: docker/metadata-action@v5
id: meta
with:
images: ghcr.io/${{ github.repository_owner }}/prql-devcontainer-base
Expand All @@ -33,24 +29,24 @@ jobs:
type=raw,latest
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Prep args
run: |
echo "cargo_crates=$(yq -r '.vars.cargo_crates' Taskfile.yml)" >>"$GITHUB_ENV"
- name: Build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
timeout-minutes: 3600
with:
context: .devcontainer/base-image
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/build-web.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ env:
RUSTFLAGS: "-C debuginfo=0"
RUSTDOCFLAGS: "-Dwarnings"

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

jobs:
build-web:
runs-on: ubuntu-latest
Expand All @@ -26,7 +21,7 @@ jobs:

steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

# Website requires hugo
- name: Setup hugo
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/lint-megalinter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,12 @@ env: # Comment env block if you do not want to apply fixes
APPLY_FIXES_EVENT: pull_request # Decide which event triggers application of fixes in a commit or a PR (pull_request, push, all)
APPLY_FIXES_MODE: commit # If APPLY_FIXES is used, defines if the fixes are directly committed (commit) or posted in a PR (pull_request)

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
build:
name: lint-megalinter
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # If you use VALIDATE_ALL_CODEBASE = true, you can remove this line to improve performances

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

# Upload MegaLinter artifacts
- name: Archive production artifacts
if: ${{ success() }} || ${{ failure() }}
if: always()
uses: actions/upload-artifact@v3
with:
name: MegaLinter reports
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ jobs:
checks: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: rustsec/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}

cargo-bench:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: richb-hanover/[email protected]
with:
command: bench
Expand All @@ -55,7 +55,7 @@ jobs:
use_cache: [true, false]
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: ./.github/actions/time-compilation
with:
use_cache: ${{ matrix.use_cache }}
Expand All @@ -72,7 +72,7 @@ jobs:
# default to run on. The minimum is defined by Cargo.toml's metadata.msrv.
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: a-kenji/update-rust-toolchain@main
with:
# Discussion in #1561
Expand All @@ -84,7 +84,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- run: rustup override set nightly-2023-04-22
- uses: baptiste0928/cargo-install@v2
with:
Expand All @@ -107,7 +107,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - name: 📂 Checkout code
# uses: actions/checkout@v3
# uses: actions/checkout@v4

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

Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
target: x86_64-pc-windows-msvc
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: ./.github/actions/build-prqlc
id: build-artifact
with:
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 👷 Build prql-compiler
run: cargo build --release
- name: Copy files into .deb package
Expand All @@ -111,7 +111,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 👷 Build prqlc
run: cargo build --bin prqlc --release
- name: Copy files into .rpm package
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
if: ${{ github.event_name == 'release' }}
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Move Snap to project root directory
run: cp -r packages/snap/ .
- name: 📦 Build Snap
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
target: source
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: ./.github/actions/build-prql-python
with:
target: ${{ matrix.target }}
Expand All @@ -197,7 +197,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: baptiste0928/cargo-install@v2
with:
crate: wasm-pack
Expand All @@ -219,7 +219,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- uses: baptiste0928/cargo-install@v2
with:
crate: cargo-release
Expand All @@ -237,7 +237,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout code
# uses: actions/checkout@v3
# uses: actions/checkout@v4
# - name: Install Java and Maven
# uses: actions/setup-java@v3
# with:
Expand All @@ -256,7 +256,7 @@ jobs:
if: github.event_name == 'release'
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- run: git push origin HEAD:web --force

push-devcontainer:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/test-dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,12 @@ on:
workflow_call:
workflow_dispatch:

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

jobs:
test:
runs-on: ubuntu-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 🏗 Build prql-lib
run: cargo build
working-directory: bindings/prql-lib
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test-elixir.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ on:
type: string
default: '["ubuntu-latest"]'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-elixir
cancel-in-progress: true

defaults:
run:
working-directory: bindings/prql-elixir
Expand All @@ -34,7 +30,7 @@ jobs:
steps:
# Step: Check out the code.
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

# Step: Setup Elixir + Erlang image as the base.
- name: Set up Elixir on Windows or Linux
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test-java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ on:
type: string
default: '["ubuntu-latest"]'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-java
cancel-in-progress: true

jobs:
test:
runs-on: ${{ matrix.os }}
Expand All @@ -24,7 +20,7 @@ jobs:
os: ${{ fromJSON(inputs.oss) }}
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- run: ./.github/set_version.sh
- name: 💰 Cache
uses: Swatinem/rust-cache@v2
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test-js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ env:
RUSTFLAGS: "-C debuginfo=0"
RUSTDOCFLAGS: "-Dwarnings"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-js
cancel-in-progress: true

jobs:
test:
runs-on: ${{ matrix.os }}
Expand All @@ -30,7 +26,7 @@ jobs:
os: ${{ fromJSON(inputs.oss) }}
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/test-lib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,12 @@ on:
workflow_call:
workflow_dispatch:

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

jobs:
test-lib:
runs-on: ubuntu-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- run: ./.github/set_version.sh
- name: 💰 Cache
uses: Swatinem/rust-cache@v2
Expand All @@ -38,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 📂 Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- run: ./.github/set_version.sh
- name: 💰 Cache
uses: Swatinem/rust-cache@v2
Expand Down
Loading

0 comments on commit acea409

Please sign in to comment.