Skip to content
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

chore: refresh images and adjust to main branch #97

Merged
merged 1 commit into from
Oct 26, 2024
Merged

chore: refresh images and adjust to main branch #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .codespellignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
stoll
deque
musl
tru
fals
10 changes: 4 additions & 6 deletions .github/docker/monkey-github-builder-clang/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM debian:bookworm

RUN \
sed -n -e 's/^deb /deb-src /p' /etc/apt/sources.list >/etc/apt/sources.list.d/monkey-sources.list && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
build-essential \
ca-certificates \
clang-13 \
Expand All @@ -12,8 +11,7 @@ RUN \
libc++-13-dev \
libc++abi-13-dev \
libc6-dev \
libstdc++-10-dev \
libstdc++-11-dev \
ninja-build \
python3

RUN rm -rf /var/lib/apt/lists/*
python3 && \
rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion .github/docker/monkey-github-builder-void-linux-musl-clang/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ FROM ghcr.io/void-linux/void-musl
RUN xbps-install -Syu || xbps-install -yu xbps \
&& xbps-install -yu \
&& xbps-install -y bash git cmake clang python3-codespell ninja clang clang-tools-extra cppcheck \
&& xbps-remove -Oy
&& xbps-remove -Ooy


26 changes: 15 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,21 @@ name: Continuous Integration
on:
push:
branches:
- master
- main

pull_request:
branches:
- master
- main

concurrency:
group: ${{ format('ci-{0}', github.ref) }}
cancel-in-progress: true

jobs:
Lint:
runs-on: ubuntu-latest
container:
image: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1"
image: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2"

steps:
- name: Checkout
Expand Down Expand Up @@ -47,7 +51,7 @@ jobs:
- {
runs_on: ubuntu-latest,
name: "Clang 13 libc++",
container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v1",
container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v2",
CC: clang-13,
CXX: clang++-13,
CFLAGS: "-stdlib=libc++",
Expand All @@ -58,7 +62,7 @@ jobs:
- {
runs_on: ubuntu-latest,
name: "Clang 13 libstdc++",
container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v1",
container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v2",
CC: clang-13,
CXX: clang++-13,
CFLAGS: "-stdlib=libstdc++",
Expand All @@ -69,7 +73,7 @@ jobs:
- {
runs_on: ubuntu-latest,
name: "Clang 13 ASAN+UBSAN libstdc++",
container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v1",
container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v2",
CC: clang-13,
CXX: clang++-13,
CFLAGS: "-fsanitize=address,undefined -fsanitize-address-use-after-scope -fno-sanitize-recover=address,undefined -stdlib=libstdc++",
Expand All @@ -81,7 +85,7 @@ jobs:
- {
runs_on: ubuntu-latest,
name: "Clang 13 Release libstdc++",
container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v1",
container: "ghcr.io/hrzlgnm/monkey-github-builder-clang:v2",
CC: clang-13,
CXX: clang++-13,
CFLAGS: "-stdlib=libstdc++",
Expand All @@ -92,7 +96,7 @@ jobs:
- {
runs_on: ubuntu-latest,
name: "Clang 15 musl",
container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1",
container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2",
CC: clang,
CXX: clang++,
CFLAGS: "",
Expand All @@ -103,7 +107,7 @@ jobs:
- {
runs_on: ubuntu-latest,
name: "Clang 15 musl ASAN+UBSAN",
container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1",
container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2",
CC: clang,
CXX: clang++,
CFLAGS: "-fsanitize=address,undefined -fsanitize-address-use-after-scope -fno-sanitize-recover=address,undefined -fuse-ld=gold",
Expand All @@ -115,7 +119,7 @@ jobs:
- {
runs_on: ubuntu-latest,
name: "Clang 15 musl Release",
container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1",
container: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2",
CC: clang,
CXX: clang++,
CFLAGS: "",
Expand Down Expand Up @@ -187,7 +191,7 @@ jobs:
needs: [Lint]
runs-on: ubuntu-latest
container:
image: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v1"
image: "ghcr.io/hrzlgnm/monkey-github-builder-void-linux-musl-clang:v2"

steps:
- name: Checkout
Expand Down
Loading