Skip to content

Commit 67df9ad

Browse files
committed
Upgrade dev env
1 parent bf65b6d commit 67df9ad

File tree

5 files changed

+28
-29
lines changed

5 files changed

+28
-29
lines changed

.github/workflows/docker-vizzu-dev-desktop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
- name: Build and Publish
2525
run: |
2626
IMAGE="vizzu-dev-desktop"
27-
IMAGE_NAME="vizzu/$IMAGE:0.12"
27+
IMAGE_NAME="vizzu/$IMAGE:0.12next"
2828
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
2929
docker push $IMAGE_NAME

.github/workflows/docker-vizzu-dev-wasm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
- name: Build and Publish
2525
run: |
2626
IMAGE="vizzu-dev-wasm"
27-
IMAGE_NAME="vizzu/$IMAGE:0.12"
27+
IMAGE_NAME="vizzu/$IMAGE:0.12next"
2828
docker build -t $IMAGE_NAME -f tools/ci/docker/$IMAGE .
2929
docker push $IMAGE_NAME

tools/ci/docker/vizzu-dev-desktop

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

@@ -8,13 +8,12 @@ RUN apt-get install -y git wget gnupg software-properties-common
88

99
RUN add-apt-repository ppa:deadsnakes/ppa -y \
1010
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
11-
&& add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main" \
1211
&& apt-get update \
13-
&& apt-get install -y g++-12 clang-16 clang-tools-16 lldb-16 lld-16 clang-tidy-16 clang-format-16 cppcheck cmake \
14-
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 120 \
15-
&& update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 120 \
16-
&& update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-16 120 \
17-
&& ln -s /usr/bin/clang-tidy-16 /usr/bin/clang-tidy \
18-
&& ln -s /usr/bin/clang-format-16 /usr/bin/clang-format
12+
&& apt-get install -y clang-18 clang-tools-18 lldb-18 lld-18 clang-tidy-18 clang-format-18 cppcheck cmake \
13+
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 120 \
14+
&& update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 120 \
15+
&& update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-18 120 \
16+
&& ln -s /usr/bin/clang-tidy-18 /usr/bin/clang-tidy \
17+
&& ln -s /usr/bin/clang-format-18 /usr/bin/clang-format
1918

2019
WORKDIR /workspace/

tools/ci/docker/vizzu-dev-wasm

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update
44

55
RUN apt-get install -y git wget curl gnupg
66

7-
RUN apt-get install -y python3.10 python3.10-venv \
8-
&& ln -s /usr/bin/python3.10 /usr/bin/python
7+
RUN apt-get install -y python3.12 python3.12-venv \
8+
&& ln -s /usr/bin/python3.12 /usr/bin/python
99

1010
RUN mkdir -p /etc/apt/keyrings \
1111
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
12-
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
12+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
1313
&& apt-get update \
1414
&& apt-get install -y nodejs
1515

1616
RUN apt-get install -y cmake build-essential \
1717
&& cd /root \
1818
&& git clone https://github.com/emscripten-core/emsdk.git \
1919
&& cd /root/emsdk \
20-
&& ./emsdk install 3.1.64 \
21-
&& ./emsdk activate 3.1.64 \
20+
&& ./emsdk install 3.1.65 \
21+
&& ./emsdk activate 3.1.65 \
2222
&& echo "source \"/root/emsdk/emsdk_env.sh\"" >> /root/.bashrc
2323

2424
# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer

tools/ci/gcp/cloudbuild/cloudbuild.yaml

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ steps:
33
id: pull_wasm
44
waitFor:
55
- '-'
6-
args: ['pull', 'vizzu/vizzu-dev-wasm:0.12']
6+
args: ['pull', 'vizzu/vizzu-dev-wasm:0.12next']
77

88
- name: 'gcr.io/cloud-builders/docker'
99
id: pull_desktop
1010
waitFor:
1111
- '-'
12-
args: ['pull', 'vizzu/vizzu-dev-desktop:0.12']
12+
args: ['pull', 'vizzu/vizzu-dev-desktop:0.12next']
1313

14-
- name: vizzu/vizzu-dev-wasm:0.12
14+
- name: vizzu/vizzu-dev-wasm:0.12next
1515
id: init
1616
waitFor:
1717
- pull_wasm
@@ -24,7 +24,7 @@ steps:
2424
./tools/ci/run/init-py.sh
2525
dir: /workspace
2626

27-
- name: vizzu/vizzu-dev-wasm:0.12
27+
- name: vizzu/vizzu-dev-wasm:0.12next
2828
id: check_src
2929
waitFor:
3030
- init
@@ -41,7 +41,7 @@ steps:
4141
npm run lint:src
4242
fi
4343
dir: /workspace
44-
- name: vizzu/vizzu-dev-wasm:0.12
44+
- name: vizzu/vizzu-dev-wasm:0.12next
4545
id: check_docs
4646
waitFor:
4747
- init
@@ -58,7 +58,7 @@ steps:
5858
npm run lint:docs
5959
fi
6060
dir: /workspace
61-
- name: vizzu/vizzu-dev-wasm:0.12
61+
- name: vizzu/vizzu-dev-wasm:0.12next
6262
id: check_tools
6363
waitFor:
6464
- init
@@ -77,7 +77,7 @@ steps:
7777
fi
7878
dir: /workspace
7979

80-
- name: vizzu/vizzu-dev-desktop:0.12
80+
- name: vizzu/vizzu-dev-desktop:0.12next
8181
id: build_desktop_clangformat
8282
waitFor:
8383
- pull_desktop
@@ -97,7 +97,7 @@ steps:
9797
fi
9898
dir: /workspace
9999

100-
- name: vizzu/vizzu-dev-desktop:0.12
100+
- name: vizzu/vizzu-dev-desktop:0.12next
101101
id: build_desktop_clangtidy
102102
waitFor:
103103
- build_desktop_clangformat
@@ -113,7 +113,7 @@ steps:
113113
./tools/ci/run/pkg-build-desktop-clangtidy.sh
114114
fi
115115
dir: /workspace
116-
- name: vizzu/vizzu-dev-wasm:0.12
116+
- name: vizzu/vizzu-dev-wasm:0.12next
117117
id: build_wasm
118118
waitFor:
119119
- build_desktop_clangformat
@@ -134,7 +134,7 @@ steps:
134134
./tools/ci/run/pkg-build-js.sh
135135
dir: /workspace
136136

137-
- name: vizzu/vizzu-dev-wasm:0.12
137+
- name: vizzu/vizzu-dev-wasm:0.12next
138138
id: lib_sha
139139
waitFor:
140140
- build_wasm
@@ -157,7 +157,7 @@ steps:
157157
fi
158158
dir: /workspace
159159

160-
- name: vizzu/vizzu-dev-wasm:0.12
160+
- name: vizzu/vizzu-dev-wasm:0.12next
161161
id: test
162162
waitFor:
163163
- lib_sha
@@ -172,7 +172,7 @@ steps:
172172
fi
173173
dir: /workspace
174174

175-
- name: vizzu/vizzu-dev-wasm:0.12
175+
- name: vizzu/vizzu-dev-wasm:0.12next
176176
id: docs
177177
waitFor:
178178
- test
@@ -215,7 +215,7 @@ steps:
215215
- VIZZUHQ_GITHUB_USER
216216
- VIZZUHQ_GITHUB_EMAIL
217217

218-
- name: vizzu/vizzu-dev-wasm:0.12
218+
- name: vizzu/vizzu-dev-wasm:0.12next
219219
id: publish
220220
waitFor:
221221
- docs

0 commit comments

Comments
 (0)