Skip to content

Commit

Permalink
Add libclang-rt-16-dev which is now needed, update actions
Browse files Browse the repository at this point in the history
  • Loading branch information
eddelbuettel committed Feb 9, 2024
1 parent 608296d commit 66fd231
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,32 @@ name: docker

on:
push:
# schedule:
# - cron: "22 2 * * 2"
schedule:
- cron: "22 2 * * 2"
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

#- name: Set up QEMU
# uses: docker/setup-qemu-action@v1

- name: Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Login
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
push: true
Expand All @@ -36,7 +37,7 @@ jobs:
run: date --rfc-3339=seconds > lastBuild.txt

- name: Commit and push
uses: EndBug/add-and-commit@v7
uses: EndBug/add-and-commit@v9
with:
add: "lastBuild.txt"
push: true
Expand Down
13 changes: 7 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ RUN apt-get update -qq \
## Compiler flags from https://www.stats.ox.ac.uk/pub/bdr/memtests/README.txt
##
## Also add git autotools-dev automake so that we can build littler from source
## libclang-rt-16-dev now required
##
RUN apt-get update -qq \
&& apt-get install -t unstable -y --no-install-recommends \
Expand All @@ -32,6 +33,7 @@ RUN apt-get update -qq \
libblas-dev \
libbz2-dev \
libcairo2-dev \
libclang-rt-16-dev \
libcurl4-openssl-dev \
libjpeg-dev \
liblapack-dev \
Expand Down Expand Up @@ -87,13 +89,12 @@ RUN cd /tmp/R-devel \
R_PRINTCMD=/usr/bin/lpr \
LIBnn=lib \
AWK=/usr/bin/awk \
CC="clang -fsanitize=address,undefined -fno-sanitize=float-divide-by-zero -fno-omit-frame-pointer -fsanitize-address-use-after-scope -fno-sanitize=alignment" \
CXX="clang++ -stdlib=libc++ -fsanitize=address,undefined -fno-sanitize=float-divide-by-zero -fno-omit-frame-pointer -fsanitize-address-use-after-scope -fno-sanitize=alignment -frtti" \
CFLAGS="-g -O3 -Wall -pedantic -mtune=native" \
CC="clang -fsanitize=address,undefined -fno-sanitize=float-divide-by-zero -fno-sanitize=alignment -fno-omit-frame-pointer" \
CXX="clang++ -fsanitize=address,undefined -fno-sanitize=float-divide-by-zero -fno-sanitize=alignment -fno-omit-frame-pointer -frtti" \
CFLAGS="-g -O3 -Wall -pedantic" \
FFLAGS="-g -O2 -mtune=native" \
FCFLAGS="-g -O2 -mtune=native" \
CXXFLAGS="-g -O3 -Wall -pedantic -mtune=native" \
MAIN_LD="clang++ -stdlib=libc++ -fsanitize=undefined,address" \
CXXFLAGS="-g -O3 -Wall -pedantic" \
MAIN_LD="clang++ -fsanitize=undefined,address" \
FC="gfortran" \
F77="gfortran" \
ASAN_OPTIONS=detect_leaks=0 \
Expand Down

0 comments on commit 66fd231

Please sign in to comment.