Skip to content

Bump GitHub Actions runners to Ubuntu 22.04 #1619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 4, 2024
Merged

Bump GitHub Actions runners to Ubuntu 22.04 #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c820d2b
Don't include subproject headers with -I
aswaterman Mar 4, 2024
460d382
Explicitly capture "this" in lambdas
aswaterman Mar 4, 2024
5395961
Bump to Ubuntu 22.04
aswaterman Mar 4, 2024
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/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
test:
name: Test Spike build (Ubuntu)
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/debug-smoke.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
test:
name: Test debug (Ubuntu)
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ install_exes_dir := $(INSTALLDIR)/bin
sprojs := @subprojects@
sprojs_enabled := @subprojects_enabled@

sprojs_include := -I. -I$(src_dir) $(addprefix -I$(src_dir)/, $(sprojs_enabled))
sprojs_include := -iquote . -I$(src_dir) $(addprefix -iquote $(src_dir)/, $(sprojs_enabled))
VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))

#-------------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions fdt/fdt.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ fdt_c_srcs = \
fdt_empty_tree.c \
fdt_addresses.c \
fdt_overlay.c \

fdt_CFLAGS = -I$(src_dir)/fdt
4 changes: 2 additions & 2 deletions riscv/interactive.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ void sim_t::interactive_run(const std::string& cmd, const std::vector<std::strin
step(1);

if (actual_steps < steps) {
next_interactive_action = [=](){ interactive_run(cmd, {std::to_string(steps - actual_steps)}, noisy); };
next_interactive_action = [=, this](){ interactive_run(cmd, {std::to_string(steps - actual_steps)}, noisy); };
return;
}

Expand Down Expand Up @@ -766,7 +766,7 @@ void sim_t::interactive_until(const std::string& cmd, const std::vector<std::str
step(1);
}

next_interactive_action = [=](){ interactive_until(cmd, args, noisy); };
next_interactive_action = [=, this](){ interactive_until(cmd, args, noisy); };
}

void sim_t::interactive_dumpmems(const std::string& cmd, const std::vector<std::string>& args)
Expand Down
2 changes: 1 addition & 1 deletion riscv/riscv.mk.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ riscv_subproject_deps = \
fesvr \
softfloat \

riscv_CFLAGS = -fPIC
riscv_CFLAGS = -fPIC -I$(src_dir)/fdt

riscv_install_shared_lib = yes

Expand Down