From 58cabb97d04773fed60a5cba3aed744fc609b7a2 Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 3 Dec 2023 15:10:16 +0100 Subject: [PATCH] fixed build status, updated run-clang-x tools (#4) * fixed build status, updated run-clang-x tools * added pull_request as CI trigger --- .github/workflows/ci.yml | 3 +-- builder.Dockerfile | 8 ++++++-- readme.md | 4 +--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be5fba3..5dacc95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,8 +1,7 @@ name: ci on: - # FIXME: if you want this to be available for PRs, uncomment this line - # pull_request: + pull_request: push: branches: - main diff --git a/builder.Dockerfile b/builder.Dockerfile index 05d2423..0fad747 100644 --- a/builder.Dockerfile +++ b/builder.Dockerfile @@ -4,6 +4,10 @@ ARG base_img=mcr.microsoft.com/vscode/devcontainers/base:dev-${base_tag} FROM --platform=linux/amd64 ${base_img} AS builder-install +# the following shows how to install the latest version of a package. +# you can determine the installed version with `apt-cache policy ` and fix +# the version to install with = in the list below. + RUN apt-get update --fix-missing && apt-get -y upgrade RUN apt-get install -y --no-install-recommends \ apt-utils \ @@ -68,14 +72,14 @@ RUN ln -s /usr/bin/clang-tidy-${llvm_version} /usr/local/bin/clang-tidy # option B: install pre-built clang wrappers RUN mkdir -p /usr/local/run-clang-format -RUN wget -O clang-utils.tgz "https://github.com/lmapii/run-clang-format/releases/download/v1.4.13/run-clang-format-v1.4.13-i686-unknown-linux-gnu.tar.gz" && \ +RUN wget -O clang-utils.tgz "https://github.com/lmapii/run-clang-format/releases/download/v1.4.14/run-clang-format-v1.4.14-i686-unknown-linux-gnu.tar.gz" && \ tar -C /usr/local/run-clang-format -xzf clang-utils.tgz --strip-components 1 && \ rm clang-utils.tgz ENV PATH /usr/local/run-clang-format:$PATH RUN run-clang-format --version RUN mkdir -p /usr/local/run-clang-tidy -RUN wget -O clang-utils.tgz "https://github.com/lmapii/run-clang-tidy/releases/download/v0.2.4/run-clang-tidy-v0.2.4-i686-unknown-linux-gnu.tar.gz" && \ +RUN wget -O clang-utils.tgz "https://github.com/lmapii/run-clang-tidy/releases/download/v0.2.5/run-clang-tidy-v0.2.5-i686-unknown-linux-gnu.tar.gz" && \ tar -C /usr/local/run-clang-tidy -xzf clang-utils.tgz --strip-components 1 && \ rm clang-utils.tgz ENV PATH /usr/local/run-clang-tidy:$PATH diff --git a/readme.md b/readme.md index 6d217eb..27f9961 100644 --- a/readme.md +++ b/readme.md @@ -1,8 +1,6 @@ -[![Build status](https://github.com/lmapii/pkt/workflows/ci/badge.svg)](https://github.com/lmapii/pkt/actions) +[![Build status](https://github.com/lmapii/cproject/workflows/ci/badge.svg)](https://github.com/lmapii/cproject/actions) # Example repository for a C development environment This is the example repository for a [post on the Interrupt blog](https://interrupt.memfault.com/blog/a-modern-c-dev-env). It is a demo development environment using Docker, CMake, Unity, and GitHub Actions. - -