Install clang from Ubuntu and push image from buildx

apt.llvm.org has no repository for the current ubuntu:rolling release,
and nothing pins clang 20 - CC=clang already resolved to the distro
clang. Drop the llvm.sh step along with its helper packages.

docker build now runs under the buildx docker-container driver, which
keeps the result in the build cache unless told otherwise, so push
directly from the build instead of tagging locally.

.gitea/workflows/ci.yml

@@ -16,39 +16,26 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Debug docker socket
-        run: |
-          id
-          sudo id || true
-          ls -la /var/run/docker.sock /run/user 2>&1 || true
-          sudo ls -laL /var/run/docker.sock 2>&1 || true
-          findmnt /var/run/docker.sock 2>&1 || true
-          env | grep -iE 'docker|container|podman' || true
-          sudo docker version 2>&1 || true
-          docker version 2>&1 || true
-
       - name: Log in to registry
         run: |
           echo "${{ secrets.REGISTRY_TOKEN }}" \
-            | sudo docker login -u "${{ secrets.REGISTRY_USER }}" --password-stdin git.weaselab.dev
+            | docker login -u "${{ secrets.REGISTRY_USER }}" --password-stdin git.weaselab.dev
 
       - name: Build and push image if changed
         run: |
           image=git.weaselab.dev/weaselab/conflict-set-ci
           tag="$(sha256sum Dockerfile .pre-commit-config.yaml | sha256sum | cut -c 1-16)-${{ matrix.arch }}"
           latest=latest-${{ matrix.arch }}
-          if sudo docker manifest inspect "$image:$tag" > /dev/null 2>&1; then
+          if docker manifest inspect "$image:$tag" > /dev/null 2>&1; then
-            if [ "$(sudo docker manifest inspect "$image:$tag")" = "$(sudo docker manifest inspect "$image:$latest" 2> /dev/null)" ]; then
+            if [ "$(docker manifest inspect "$image:$tag")" = "$(docker manifest inspect "$image:$latest" 2> /dev/null)" ]; then
               echo "$image:$latest is up to date"
             else
-              sudo docker pull "$image:$tag"
+              docker pull "$image:$tag"
-              sudo docker tag "$image:$tag" "$image:$latest"
+              docker tag "$image:$tag" "$image:$latest"
-              sudo docker push "$image:$latest"
+              docker push "$image:$latest"
             fi
           else
-            sudo docker build -t "$image:$tag" -t "$image:$latest" .
+            docker build --push -t "$image:$tag" -t "$image:$latest" .
-            sudo docker push "$image:$tag"
-            sudo docker push "$image:$latest"
           fi
 
   pre-commit:

Dockerfile

@@ -10,20 +10,19 @@ RUN apt-get upgrade -y
 RUN TZ=America/Los_Angeles DEBIAN_FRONTEND=noninteractive apt-get install -y \
     build-essential \
     ccache \
+    clang \
     cmake \
     curl \
     devscripts \
     gcovr \
     git \
-    gnupg \
     libc6-dbg \
-    lsb-release \
+    llvm \
     mold \
     ninja-build \
     pre-commit \
     python3-requests \
     rpm \
-    software-properties-common \
     texlive-full \
     wget \
     zstd
@@ -45,11 +44,6 @@ RUN curl -Ls https://sourceware.org/pub/valgrind/valgrind-3.22.0.tar.bz2 -o valg
     cd .. && \
     rm -rf /tmp/*
 
-# Recent clang
-RUN wget https://apt.llvm.org/llvm.sh && chmod +x ./llvm.sh && ./llvm.sh 20
-
-RUN apt-get -y install clang llvm
-
 # Set after building valgrind, which doesn't build with clang for some reason
 ENV CC=clang
 ENV CXX=clang++