Skip to content

Commit d9149cd

Browse files
HugoCasaHugoCasa
authored
Merge branch 'main' into hugo/win-423-http-triggerspreprocessor-capture
2 parents 0f1d72a + cfd93a3 commit d9149cd

Some content is hidden

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

54 files changed

+980
-578
lines changed

‎.github/workflows/backend-check.yml

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
name: Backend check
2+
on:
3+
push:
4+
paths:
5+
- "backend/**"
6+
- ".github/workflows/backend-check.yml"
7+
8+
jobs:
9+
check_oss:
10+
runs-on: ubicloud-standard-8
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
fetch-depth: 0
15+
16+
- uses: actions-rust-lang/setup-rust-toolchain@v1
17+
with:
18+
cache-workspaces: backend
19+
toolchain: 1.82.0
20+
- uses: Swatinem/rust-cache@v2
21+
with:
22+
workspaces: backend
23+
- name: cargo check
24+
working-directory: ./backend
25+
timeout-minutes: 16
26+
run: SQLX_OFFLINE=true cargo check
27+
28+
check_oss_full:
29+
runs-on: ubicloud-standard-8
30+
steps:
31+
- uses: actions/checkout@v4
32+
with:
33+
fetch-depth: 0
34+
35+
36+
- name: install xmlsec1
37+
run: |
38+
sudo apt-get update
39+
sudo apt-get install -y libxml2-dev libxmlsec1-dev
40+
41+
- uses: actions-rust-lang/setup-rust-toolchain@v1
42+
with:
43+
cache-workspaces: backend
44+
toolchain: 1.82.0
45+
- uses: Swatinem/rust-cache@v2
46+
with:
47+
workspaces: backend
48+
- name: cargo check
49+
working-directory: ./backend
50+
timeout-minutes: 16
51+
run: |
52+
mkdir -p fake_frontend_build
53+
FRONTEND_BUILD_DIR=$(pwd)/fake_frontend_build SQLX_OFFLINE=true cargo check --all-features
54+
55+
check_ee:
56+
runs-on: ubicloud-standard-8
57+
steps:
58+
- uses: actions/checkout@v4
59+
with:
60+
fetch-depth: 0
61+
62+
- name: Read EE repo commit hash
63+
run: |
64+
echo "ee_repo_ref=$(cat ./backend/ee-repo-ref.txt)" >> "$GITHUB_ENV"
65+
66+
- uses: actions/checkout@v4
67+
with:
68+
repository: windmill-labs/windmill-ee-private
69+
path: ./windmill-ee-private
70+
ref: ${{ env.ee_repo_ref }}
71+
token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
72+
fetch-depth: 0
73+
74+
75+
- name: Substitute EE code (EE logic is behind feature flag)
76+
run: |
77+
./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private
78+
79+
80+
- uses: actions-rust-lang/setup-rust-toolchain@v1
81+
with:
82+
cache-workspaces: backend
83+
toolchain: 1.82.0
84+
- uses: Swatinem/rust-cache@v2
85+
with:
86+
workspaces: backend
87+
- name: cargo check
88+
working-directory: ./backend
89+
timeout-minutes: 16
90+
run: SQLX_OFFLINE=true cargo check
91+
92+
check_ee_full:
93+
runs-on: ubicloud-standard-8
94+
steps:
95+
- uses: actions/checkout@v4
96+
with:
97+
fetch-depth: 0
98+
99+
- name: Read EE repo commit hash
100+
run: |
101+
echo "ee_repo_ref=$(cat ./backend/ee-repo-ref.txt)" >> "$GITHUB_ENV"
102+
103+
- uses: actions/checkout@v4
104+
with:
105+
repository: windmill-labs/windmill-ee-private
106+
path: ./windmill-ee-private
107+
ref: ${{ env.ee_repo_ref }}
108+
token: ${{ secrets.WINDMILL_EE_PRIVATE_ACCESS }}
109+
fetch-depth: 0
110+
111+
- name: install xmlsec1
112+
run: |
113+
sudo apt-get update
114+
sudo apt-get install -y libxml2-dev libxmlsec1-dev
115+
116+
- name: Substitute EE code (EE logic is behind feature flag)
117+
run: |
118+
./backend/substitute_ee_code.sh --copy --dir ./windmill-ee-private
119+
120+
- uses: actions-rust-lang/setup-rust-toolchain@v1
121+
with:
122+
cache-workspaces: backend
123+
toolchain: 1.82.0
124+
- uses: Swatinem/rust-cache@v2
125+
with:
126+
workspaces: backend
127+
- name: cargo check
128+
timeout-minutes: 16
129+
working-directory: ./backend
130+
run: |
131+
mkdir -p fake_frontend_build
132+
FRONTEND_BUILD_DIR=$(pwd)/fake_frontend_build SQLX_OFFLINE=true cargo check --all-features
133+
134+

‎.github/workflows/backend-test.yml

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,58 @@ on:
1313
- "backend/**"
1414
- ".github/workflows/backend-test.yml"
1515

16+
defaults:
17+
run:
18+
working-directory: ./backend
19+
1620
jobs:
1721
cargo_test:
1822
runs-on: ubicloud-standard-8
19-
container:
20-
image: ghcr.io/windmill-labs/backend-tests
2123
services:
2224
postgres:
2325
image: postgres
26+
ports:
27+
- 5432:5432
2428
env:
2529
POSTGRES_DB: windmill
2630
POSTGRES_PASSWORD: changeme
27-
2831
options: >-
2932
--health-cmd pg_isready --health-interval 10s --health-timeout 5s
3033
--health-retries 5
3134
steps:
3235
- uses: actions/checkout@v4
36+
- uses: actions/setup-dotnet@v4
37+
with:
38+
dotnet-version: "9.0.x"
39+
- uses: denoland/setup-deno@v2
40+
with:
41+
deno-version: v2.x
42+
- uses: actions/setup-go@v2
43+
with:
44+
go-version: 1.21.5
45+
- uses: actions/setup-python@v2
46+
with:
47+
python-version: 3.11
48+
- uses: oven-sh/setup-bun@v2
49+
with:
50+
bun-version: 1.1.40
51+
- uses: astral-sh/setup-uv@v4
52+
with:
53+
version: "0.4.18"
3354
- uses: actions-rust-lang/setup-rust-toolchain@v1
3455
with:
35-
toolchain: 1.80.0
36-
# - uses: Swatinem/rust-cache@v2
37-
# with:
38-
# workspaces: |
39-
# backend
40-
# backend -> target
56+
cache-workspaces: backend
57+
toolchain: 1.82.0
58+
- uses: Swatinem/rust-cache@v2
59+
with:
60+
workspaces: backend
4161
- name: cargo test
42-
timeout-minutes: 15
62+
timeout-minutes: 16
4363
run:
44-
/usr/bin/deno --version && /usr/bin/bun -v && go version &&
45-
/usr/local/bin/python3 --version && mkdir frontend/build && cd backend
46-
&& touch windmill-api/openapi-deref.yaml &&
47-
DATABASE_URL=postgres://postgres:changeme@postgres:5432/windmill
48-
DISABLE_EMBEDDING=true RUST_LOG=info cargo test --features
49-
enterprise,deno_core,license,http_trigger,zip,oauth2,python,rust --all --
50-
--nocapture
64+
deno --version && bun -v && go version && python3 --version &&
65+
SQLX_OFFLINE=true
66+
DATABASE_URL=postgres://postgres:changeme@localhost:5432/windmill
67+
DISABLE_EMBEDDING=true RUST_LOG=info PYTHON_PATH=$(which python)
68+
DENO_PATH=$(which deno) BUN_PATH=$(which bun) GO_PATH=$(which go)
69+
UV_PATH=$(which uv) cargo test --features
70+
enterprise,deno_core,license,python,rust --all -- --nocapture

‎.github/workflows/build-staging-image.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎.github/workflows/build_ws.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ jobs:
1919
- uses: actions/checkout@v4
2020
with:
2121
fetch-depth: 0
22-
- uses: depot/setup-action@v1
22+
# - uses: depot/setup-action@v1
23+
- name: Set up Docker Buildx
24+
uses: docker/setup-buildx-action@v2
25+
2326
- name: Docker meta
2427
id: meta
2528
uses: docker/metadata-action@v5
@@ -40,7 +43,7 @@ jobs:
4043
password: ${{ secrets.GITHUB_TOKEN }}
4144

4245
- name: Build and push publicly
43-
uses: depot/build-push-action@v1
46+
uses: docker/build-push-action@v6
4447
with:
4548
context: .
4649
file: ./docker/DockerfileMultiplayer

‎CHANGELOG.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,39 @@
11
# Changelog
22

3+
## [1.440.3](https://github.com/windmill-labs/windmill/compare/v1.440.2...v1.440.3) (2024-12-19)
4+
5+
6+
### Bug Fixes
7+
8+
* update bun from 1.1.38 to 1.1.40 ([c4fdd22](https://github.com/windmill-labs/windmill/commit/c4fdd2297efc43ce557cc9791151301377126c29))
9+
10+
## [1.440.2](https://github.com/windmill-labs/windmill/compare/v1.440.1...v1.440.2) (2024-12-18)
11+
12+
13+
### Bug Fixes
14+
15+
* fix redeploying flows with attached schedules ([fb536df](https://github.com/windmill-labs/windmill/commit/fb536df0668d49d14f4aed98870caaad396d0389))
16+
17+
## [1.440.1](https://github.com/windmill-labs/windmill/compare/v1.440.0...v1.440.1) (2024-12-18)
18+
19+
20+
### Bug Fixes
21+
22+
* **internal:** updating rust to 1.82 ([02a8f1f](https://github.com/windmill-labs/windmill/commit/02a8f1f86453a5f8769364ba3798998b8830d086))
23+
24+
## [1.440.0](https://github.com/windmill-labs/windmill/compare/v1.439.0...v1.440.0) (2024-12-18)
25+
26+
27+
### Features
28+
29+
* **cache:** remove persistent raw values from queue ([#4866](https://github.com/windmill-labs/windmill/issues/4866)) ([977ac5c](https://github.com/windmill-labs/windmill/commit/977ac5c3f3c2e8224f4915e483ae60f28ce008fc))
30+
31+
32+
### Bug Fixes
33+
34+
* add workspace selector and fix css for create webhook page ([#4939](https://github.com/windmill-labs/windmill/issues/4939)) ([d880655](https://github.com/windmill-labs/windmill/commit/d8806555f1d78a5fae7ae77acbcdad402e89951d))
35+
* fix relative imports in cached flow scripts ([13be0cd](https://github.com/windmill-labs/windmill/commit/13be0cd1c822d7a809dc96914dd1286510b9f9eb))
36+
337
## [1.439.0](https://github.com/windmill-labs/windmill/compare/v1.438.0...v1.439.0) (2024-12-15)
438

539

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG DEBIAN_IMAGE=debian:bookworm-slim
2-
ARG RUST_IMAGE=rust:1.80-slim-bookworm
2+
ARG RUST_IMAGE=rust:1.82-slim-bookworm
33
ARG PYTHON_IMAGE=python:3.11.10-slim-bookworm
44

55
FROM ${RUST_IMAGE} AS rust_base
@@ -177,7 +177,7 @@ COPY --from=builder /windmill/target/release/windmill ${APP}/windmill
177177

178178
COPY --from=denoland/deno:2.1.2 --chmod=755 /usr/bin/deno /usr/bin/deno
179179

180-
COPY --from=oven/bun:1.1.38 /usr/local/bin/bun /usr/bin/bun
180+
COPY --from=oven/bun:1.1.40 /usr/local/bin/bun /usr/bin/bun
181181

182182
COPY --from=php:8.3.7-cli /usr/local/bin/php /usr/bin/php
183183
COPY --from=composer:2.7.6 /usr/bin/composer /usr/bin/composer

‎backend/.sqlx/query-7a9a711c7cb05ed8a61116586fb68ef270567ebd70266f07139f3e3e34940699.json

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)