Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-js/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ runs:
with:
package_json_file: js/package.json

- uses: actions/setup-node@v6
- uses: actions/setup-node@v7
with:
cache: pnpm
cache-dependency-path: js/pnpm-lock.yaml
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v6
uses: actions/setup-go@v7
with:
go-version: ${{ matrix.go-version }}

Expand Down Expand Up @@ -118,10 +118,10 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v6
uses: actions/setup-go@v7
with:
go-version: ${{ matrix.go-version }}

Expand Down Expand Up @@ -157,10 +157,10 @@ jobs:
timeout-minutes: 5

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Setup Go ${{ matrix.go-version }}
uses: actions/setup-go@v6
uses: actions/setup-go@v7
with:
go-version: ${{ matrix.go-version }}

Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
# adds the bundled client tools to PATH for all subsequent steps.
$env:PGBIN | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append

- uses: actions/setup-go@v6
- uses: actions/setup-go@v7
with:
go-version: "stable"
check-latest: true
Expand All @@ -246,7 +246,7 @@ jobs:
shell: pwsh

- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: export RIVER_CMD_DIR
run: |
Expand Down Expand Up @@ -386,13 +386,13 @@ jobs:
pull-requests: read

steps:
- uses: actions/setup-go@v6
- uses: actions/setup-go@v7
with:
go-version: "stable"
check-latest: true

- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Lint
uses: golangci/golangci-lint-action@v9
Expand All @@ -416,9 +416,9 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- uses: actions/setup-go@v6
- uses: actions/setup-go@v7
with:
go-version: "1.27"

Expand All @@ -444,13 +444,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-go@v6
- uses: actions/setup-go@v7
with:
go-version: "stable"
check-latest: true

- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Check all go/toolchain directives match
run: CHECK=true make update-mod-go
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/conformance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ jobs:
timeout-minutes: 15

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
persist-credentials: false

- uses: actions/setup-go@v6
- uses: actions/setup-go@v7
with:
go-version-file: go.work

- uses: dtolnay/rust-toolchain@stable
id: rust

- name: Cache Rust dependencies and build artifacts
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: |
~/.cargo/registry/index
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/js.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
timeout-minutes: 20

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
persist-credentials: false

Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
persist-credentials: false

Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
RIVER_REQUIRE_POSTGRES: "1"

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
persist-credentials: false

Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
DATABASE_URL: postgres://postgres:postgres@localhost:5432/river_test?sslmode=disable

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
persist-credentials: false

Expand All @@ -176,7 +176,7 @@ jobs:
node-version: ["26.0.0", ""]

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
persist-credentials: false

Expand All @@ -186,7 +186,7 @@ jobs:

# Some unit tests read fixtures generated from River's Go
# implementation.
- uses: actions/setup-go@v6
- uses: actions/setup-go@v7
with:
go-version-file: go.work

Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
TEST_DATABASE_URL: postgres://postgres:postgres@localhost:5432/river_test?sslmode=disable

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
persist-credentials: false

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ jobs:
timeout-minutes: 20

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
fetch-depth: 0
- uses: dtolnay/rust-toolchain@stable
id: rust
with:
components: clippy,rustfmt
- name: Cache Rust dependencies and build artifacts
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: |
~/.cargo/registry/index
Expand Down Expand Up @@ -95,13 +95,13 @@ jobs:
rust-version: ["1.95", "1.96", "1.97"]

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@master
id: rust
with:
toolchain: ${{ matrix.rust-version }}
- name: Cache Rust dependencies and build artifacts
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: |
~/.cargo/registry/index
Expand All @@ -111,7 +111,7 @@ jobs:
key: rust-v1-${{ runner.os }}-${{ runner.arch }}-${{ github.job }}-${{ steps.rust.outputs.cachekey }}-${{ hashFiles('rust/**/Cargo.toml', 'rust/Cargo.lock') }}
restore-keys: rust-v1-${{ runner.os }}-${{ runner.arch }}-${{ github.job }}-${{ steps.rust.outputs.cachekey }}-
# Tests read fixtures generated from River's Go implementation.
- uses: actions/setup-go@v6
- uses: actions/setup-go@v7
with:
go-version-file: go.work
- name: Check every target and feature
Expand Down Expand Up @@ -143,11 +143,11 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- uses: dtolnay/rust-toolchain@stable
id: rust
- name: Cache Rust dependencies and build artifacts
uses: actions/cache@v5
uses: actions/cache@v6
with:
path: |
~/.cargo/registry/index
Expand All @@ -157,7 +157,7 @@ jobs:
key: rust-v1-${{ runner.os }}-${{ runner.arch }}-${{ github.job }}-${{ steps.rust.outputs.cachekey }}-${{ hashFiles('rust/**/Cargo.toml', 'rust/Cargo.lock') }}
restore-keys: rust-v1-${{ runner.os }}-${{ runner.arch }}-${{ github.job }}-${{ steps.rust.outputs.cachekey }}-
# Tests read fixtures generated from River's Go implementation.
- uses: actions/setup-go@v6
- uses: actions/setup-go@v7
with:
go-version-file: go.work
- name: Create test database
Expand Down
26 changes: 16 additions & 10 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ version = "0.50.0-alpha.1"

[workspace.dependencies]
async-trait = "0.1.92"
base64 = "0.22.1"
base64 = "0.23.1"
chrono = { version = "0.4.45", features = ["serde"] }
futures-util = { version = "0.3.34", default-features = false, features = ["std"] }
proc-macro2 = "1.0.107"
Expand All @@ -29,7 +29,7 @@ serde = { version = "1.0.229", features = ["derive"] }
serde_json = { version = "1.0.151", features = ["raw_value"] }
sha2 = "0.11.0"
sqlx = { version = "0.9.0", default-features = false, features = ["runtime-tokio"] }
syn = { version = "2.0", features = ["full"] }
syn = { version = "3.0", features = ["full"] }
thiserror = "2.0.20"
tokio = { version = "1.53.1", features = ["macros", "rt", "sync", "time"] }
tokio-util = { version = "0.7.19", features = ["rt"] }
Expand Down
Loading