Skip to content

Commit

Permalink
chore: upgrade to ubuntu jammy (hanabi1224#334)
Browse files Browse the repository at this point in the history
  • Loading branch information
hanabi1224 authored Dec 7, 2022
1 parent 3741586 commit 9899a8a
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/c.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/sh

sudo apt-get install -y libapr1 libapr1-dev libomp-12-dev
sudo apt-get install -y libapr1 libapr1-dev libomp-14-dev
12 changes: 6 additions & 6 deletions .github/clang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

# https://apt.llvm.org/
# sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 14
sudo apt-get install -y clang-14 libapr1-dev libomp-14-dev
sudo ln -sf /usr/bin/clang-14 /usr/bin/clang
clang --version
# wget https://apt.llvm.org/llvm.sh
# chmod +x llvm.sh
# sudo ./llvm.sh 14
sudo apt-get install -y libapr1-dev libomp-14-dev
# sudo ln -sf /usr/bin/clang-14 /usr/bin/clang
# clang --version
2 changes: 1 addition & 1 deletion .github/cpp.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/sh

sudo apt install -y libomp-12-dev
sudo apt install -y libomp-14-dev
2 changes: 1 addition & 1 deletion .github/dotnet.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/bash

curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
sudo apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod
sudo apt-add-repository https://packages.microsoft.com/ubuntu/22.04/prod
sudo apt-get update
sudo apt-get install -y libmsquic zlib1g-dev
4 changes: 3 additions & 1 deletion .github/hhvm.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/usr/bin/sh

sudo apt-get install -y software-properties-common apt-transport-https
sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
# sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
curl https://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -
sudo apt-key finger '[email protected]'
sudo add-apt-repository https://dl.hhvm.com/ubuntu
sudo apt-get update
sudo apt-get install -y hhvm
6 changes: 3 additions & 3 deletions .github/odin.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/sh

VERSION=dev-2022-11
VERSION=dev-2022-12
FILE_NAME=odin-ubuntu-amd64-$VERSION.zip

mkdir /tmp/odin
cd /tmp/odin
wget https://github.com/odin-lang/Odin/releases/download/$VERSION/$FILE_NAME
unzip -o $FILE_NAME
sudo chmod +x $PWD/ubuntu_artifacts/odin
sudo ln -sf $PWD/ubuntu_artifacts/odin /usr/bin/odin
sudo chmod +x $PWD/odin
sudo ln -sf $PWD/odin /usr/bin/odin
odin version
18 changes: 9 additions & 9 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04]
lang: [
acton,
c,
Expand All @@ -25,10 +25,10 @@ jobs:
crystal,
d,
dart,
elixir,
# elixir,
# fortran,
go,
hacklang,
# hacklang,
# haskell,
haxe,
java,
Expand Down Expand Up @@ -89,9 +89,9 @@ jobs:
# - name: Install graal
# if: matrix.lang == 'java' || matrix.lang == 'javascript' || matrix.lang == 'python' || matrix.lang == 'ruby' || matrix.lang == 'wasm'
# run: ./.github/graalvm.sh
# - name: Install clang
# if: matrix.lang == 'c' || matrix.lang == 'cpp'
# run: ./.github/clang.sh
- name: Install clang deps
if: matrix.lang == 'c' || matrix.lang == 'cpp'
run: ./.github/clang.sh
# - name: Install c deps
# if: matrix.lang == 'c'
# run: ./.github/c.sh
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04]
steps:
- run: echo 'dummy step as PR gate'
bench:
Expand All @@ -241,7 +241,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04]
steps:
- run: lscpu
- uses: actions/setup-dotnet@v3
Expand Down Expand Up @@ -313,7 +313,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-22.04]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
6 changes: 3 additions & 3 deletions bench/bench_v.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ problems:
# - name: json-serde
# source:
# - 1.v
- name: mandelbrot
source:
- 1.v
# - name: mandelbrot
# source:
# - 1.v
- name: nsieve
source:
- 1.v
Expand Down
6 changes: 3 additions & 3 deletions bench/bench_v_autofree.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ problems:
# - name: json-serde
# source:
# - 1.v
- name: mandelbrot
source:
- 1.v
# - name: mandelbrot
# source:
# - 1.v
- name: nsieve
source:
- 1.v
Expand Down
10 changes: 1 addition & 9 deletions bench/bench_zig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@ environments:
version: latest
docker:
include: zig
build: zig build -Dcpu=broadwell -fno-stage1 --verbose-llvm-cpu-features
build: zig build -Dcpu=broadwell --verbose-llvm-cpu-features
out_dir: zig-out/bin
run_cmd: app
# - os: linux
# compiler: zig/stage1
# version: latest
# docker:
# include: zig
# build: zig build -Dcpu=broadwell -fstage1 --verbose-llvm-cpu-features
# out_dir: zig-out/bin
# run_cmd: app

0 comments on commit 9899a8a

Please sign in to comment.