Skip to content

Commit

Permalink
Upgrade dev env to Noble (and VC to 6.0.13, required for compilation …
Browse files Browse the repository at this point in the history
…of VC in Noble)
  • Loading branch information
carlosabalde committed Nov 18, 2024
1 parent 7fcb911 commit 61e2e58
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

strategy:
matrix:
Expand All @@ -33,13 +33,13 @@ jobs:
sudo apt update
sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=non-empty-value apt install -y \
automake autotools-dev lcov libcurl4-gnutls-dev \
libedit-dev libeditline-dev libjemalloc-dev libncurses-dev \
libedit-dev libjemalloc-dev libncurses-dev \
liblua5.1-0-dev libluajit-5.1-dev libpcre3-dev libtool lua5.1 \
luajit python-docutils python3-sphinx vim-common
luajit python3-docutils python3-sphinx vim-common
- name: Install Varnish Cache
run: |
wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-6.0.9.tgz
wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-6.0.13.tgz
tar zxvf varnish-*.tgz
pushd varnish-*/
./autogen.sh
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal-20211006
FROM ubuntu:noble-20240423

ENV DEBIAN_FRONTEND noninteractive

Expand All @@ -21,7 +21,6 @@ RUN apt update \
less \
libcurl4-gnutls-dev \
libedit-dev \
libeditline-dev \
libjemalloc-dev \
liblua5.1-0-dev \
libluajit-5.1-dev \
Expand All @@ -32,7 +31,7 @@ RUN apt update \
luajit \
make \
nano \
netcat \
netcat-traditional \
pkg-config \
python3 \
python3-docutils \
Expand All @@ -47,7 +46,7 @@ RUN apt update \
&& rm -rf /var/lib/apt/lists/*

RUN cd /tmp \
&& wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-6.0.9.tgz \
&& wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-6.0.13.tgz \
&& tar zxvf varnish-*.tgz \
&& rm -f varnish-*.tgz \
&& cd varnish-* \
Expand Down
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dist_doc_DATA = README.rst LICENSE

CODE_COVERAGE_OUTPUT_DIRECTORY = lcov
CODE_COVERAGE_IGNORE_PATTERN = "/usr/*" cJSON.c ini.c duktape.c
CODE_COVERAGE_LCOV_RMOPTS = --ignore-errors unused
CODE_COVERAGE_GENHTML_OPTIONS = --prefix $(abs_top_srcdir)

@CODE_COVERAGE_RULES@
Expand Down

0 comments on commit 61e2e58

Please sign in to comment.