Skip to content

Commit 9899a8a

Browse files
authored
chore: upgrade to ubuntu jammy (#334)
1 parent 3741586 commit 9899a8a

File tree

10 files changed

+31
-37
lines changed

10 files changed

+31
-37
lines changed

.github/c.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/sh
22

3-
sudo apt-get install -y libapr1 libapr1-dev libomp-12-dev
3+
sudo apt-get install -y libapr1 libapr1-dev libomp-14-dev

.github/clang.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# https://apt.llvm.org/
44
# sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
5-
wget https://apt.llvm.org/llvm.sh
6-
chmod +x llvm.sh
7-
sudo ./llvm.sh 14
8-
sudo apt-get install -y clang-14 libapr1-dev libomp-14-dev
9-
sudo ln -sf /usr/bin/clang-14 /usr/bin/clang
10-
clang --version
5+
# wget https://apt.llvm.org/llvm.sh
6+
# chmod +x llvm.sh
7+
# sudo ./llvm.sh 14
8+
sudo apt-get install -y libapr1-dev libomp-14-dev
9+
# sudo ln -sf /usr/bin/clang-14 /usr/bin/clang
10+
# clang --version

.github/cpp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/sh
22

3-
sudo apt install -y libomp-12-dev
3+
sudo apt install -y libomp-14-dev

.github/dotnet.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/bash
22

33
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
4-
sudo apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod
4+
sudo apt-add-repository https://packages.microsoft.com/ubuntu/22.04/prod
55
sudo apt-get update
66
sudo apt-get install -y libmsquic zlib1g-dev

.github/hhvm.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/usr/bin/sh
22

33
sudo apt-get install -y software-properties-common apt-transport-https
4-
sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
4+
# sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
5+
curl https://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
6+
sudo apt-key finger '[email protected]'
57
sudo add-apt-repository https://dl.hhvm.com/ubuntu
68
sudo apt-get update
79
sudo apt-get install -y hhvm

.github/odin.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/sh
22

3-
VERSION=dev-2022-11
3+
VERSION=dev-2022-12
44
FILE_NAME=odin-ubuntu-amd64-$VERSION.zip
55

66
mkdir /tmp/odin
77
cd /tmp/odin
88
wget https://github.com/odin-lang/Odin/releases/download/$VERSION/$FILE_NAME
99
unzip -o $FILE_NAME
10-
sudo chmod +x $PWD/ubuntu_artifacts/odin
11-
sudo ln -sf $PWD/ubuntu_artifacts/odin /usr/bin/odin
10+
sudo chmod +x $PWD/odin
11+
sudo ln -sf $PWD/odin /usr/bin/odin
1212
odin version

.github/workflows/bench.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
os: [ubuntu-20.04]
18+
os: [ubuntu-22.04]
1919
lang: [
2020
acton,
2121
c,
@@ -25,10 +25,10 @@ jobs:
2525
crystal,
2626
d,
2727
dart,
28-
elixir,
28+
# elixir,
2929
# fortran,
3030
go,
31-
hacklang,
31+
# hacklang,
3232
# haskell,
3333
haxe,
3434
java,
@@ -89,9 +89,9 @@ jobs:
8989
# - name: Install graal
9090
# if: matrix.lang == 'java' || matrix.lang == 'javascript' || matrix.lang == 'python' || matrix.lang == 'ruby' || matrix.lang == 'wasm'
9191
# run: ./.github/graalvm.sh
92-
# - name: Install clang
93-
# if: matrix.lang == 'c' || matrix.lang == 'cpp'
94-
# run: ./.github/clang.sh
92+
- name: Install clang deps
93+
if: matrix.lang == 'c' || matrix.lang == 'cpp'
94+
run: ./.github/clang.sh
9595
# - name: Install c deps
9696
# if: matrix.lang == 'c'
9797
# run: ./.github/c.sh
@@ -231,7 +231,7 @@ jobs:
231231
strategy:
232232
fail-fast: true
233233
matrix:
234-
os: [ubuntu-20.04]
234+
os: [ubuntu-22.04]
235235
steps:
236236
- run: echo 'dummy step as PR gate'
237237
bench:
@@ -241,7 +241,7 @@ jobs:
241241
strategy:
242242
fail-fast: true
243243
matrix:
244-
os: [ubuntu-20.04]
244+
os: [ubuntu-22.04]
245245
steps:
246246
- run: lscpu
247247
- uses: actions/setup-dotnet@v3
@@ -313,7 +313,7 @@ jobs:
313313
runs-on: ${{ matrix.os }}
314314
strategy:
315315
matrix:
316-
os: [ubuntu-20.04]
316+
os: [ubuntu-22.04]
317317
steps:
318318
- uses: actions/checkout@v3
319319
- uses: actions/setup-node@v3

bench/bench_v.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ problems:
3131
# - name: json-serde
3232
# source:
3333
# - 1.v
34-
- name: mandelbrot
35-
source:
36-
- 1.v
34+
# - name: mandelbrot
35+
# source:
36+
# - 1.v
3737
- name: nsieve
3838
source:
3939
- 1.v

bench/bench_v_autofree.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ problems:
3131
# - name: json-serde
3232
# source:
3333
# - 1.v
34-
- name: mandelbrot
35-
source:
36-
- 1.v
34+
# - name: mandelbrot
35+
# source:
36+
# - 1.v
3737
- name: nsieve
3838
source:
3939
- 1.v

bench/bench_zig.yaml

+1-9
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@ environments:
6666
version: latest
6767
docker:
6868
include: zig
69-
build: zig build -Dcpu=broadwell -fno-stage1 --verbose-llvm-cpu-features
69+
build: zig build -Dcpu=broadwell --verbose-llvm-cpu-features
7070
out_dir: zig-out/bin
7171
run_cmd: app
72-
# - os: linux
73-
# compiler: zig/stage1
74-
# version: latest
75-
# docker:
76-
# include: zig
77-
# build: zig build -Dcpu=broadwell -fstage1 --verbose-llvm-cpu-features
78-
# out_dir: zig-out/bin
79-
# run_cmd: app

0 commit comments

Comments
 (0)