From c8cc1d4f2120f06b6ce4d0ec4b38f938082ed9fc Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 08:22:55 +0400 Subject: [PATCH 01/24] Add dockerfiles --- docker/alpine/Dockerfile | 4 ++++ docker/archlinux/Dockerfile | 3 +++ docker/debian-stable/Dockerfile | 4 ++++ docker/debian-unstable/Dockerfile | 4 ++++ docker/fedora/Dockerfile | 5 +++++ docker/gentoo-glibc/Dockerfile | 6 ++++++ docker/gentoo-glibc/Dockerfile.save | 5 +++++ docker/gentoo-musl/Dockerfile | 6 ++++++ docker/ubuntu/Dockerfile | 4 ++++ test.cpp | 0 10 files changed, 41 insertions(+) create mode 100644 docker/alpine/Dockerfile create mode 100644 docker/archlinux/Dockerfile create mode 100644 docker/debian-stable/Dockerfile create mode 100644 docker/debian-unstable/Dockerfile create mode 100644 docker/fedora/Dockerfile create mode 100644 docker/gentoo-glibc/Dockerfile create mode 100644 docker/gentoo-glibc/Dockerfile.save create mode 100644 docker/gentoo-musl/Dockerfile create mode 100644 docker/ubuntu/Dockerfile delete mode 100644 test.cpp diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile new file mode 100644 index 00000000..5a483539 --- /dev/null +++ b/docker/alpine/Dockerfile @@ -0,0 +1,4 @@ +FROM alpine:latest + +RUN apk update +RUN apk add clang gcc git cmake make gtest-dev gtest-src re2 re2-dev fmt fmt-dev diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile new file mode 100644 index 00000000..b371a2dd --- /dev/null +++ b/docker/archlinux/Dockerfile @@ -0,0 +1,3 @@ +FROM archlinux:latest + +RUN pacman -Syu cmake git clang gcc gtest re2 fmt base-devel --noconfirm diff --git a/docker/debian-stable/Dockerfile b/docker/debian-stable/Dockerfile new file mode 100644 index 00000000..ab2d66db --- /dev/null +++ b/docker/debian-stable/Dockerfile @@ -0,0 +1,4 @@ +FROM debian + +RUN apt update +RUN apt install git cmake clang libre2-9 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which -y diff --git a/docker/debian-unstable/Dockerfile b/docker/debian-unstable/Dockerfile new file mode 100644 index 00000000..eb3d7994 --- /dev/null +++ b/docker/debian-unstable/Dockerfile @@ -0,0 +1,4 @@ +FROM debian:unstable + +RUN apt update +RUN apt install git cmake clang libre2-11 libre2-dev libfmt10 libfmt-dev libgtest-dev googletest gnu-which -y diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile new file mode 100644 index 00000000..35307d46 --- /dev/null +++ b/docker/fedora/Dockerfile @@ -0,0 +1,5 @@ +FROM fedora + +RUN dnf update -y +RUN dnf install clang clang-libs gcc gtest gtest-devel fmt fmt-devel re2 re2-devel gtest gtest-devel git cmake libasan which -y + diff --git a/docker/gentoo-glibc/Dockerfile b/docker/gentoo-glibc/Dockerfile new file mode 100644 index 00000000..2bf7447a --- /dev/null +++ b/docker/gentoo-glibc/Dockerfile @@ -0,0 +1,6 @@ +FROM gentoo/stage3:systemd + +RUN emerge --sync +RUN getuto +RUN emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which --getbinpkg +RUN source /etc/profile diff --git a/docker/gentoo-glibc/Dockerfile.save b/docker/gentoo-glibc/Dockerfile.save new file mode 100644 index 00000000..a8034b04 --- /dev/null +++ b/docker/gentoo-glibc/Dockerfile.save @@ -0,0 +1,5 @@ +FROM gentoo/stage3:systemd + +RUN emerge --sync +RUN getuto +RUN emerge llvm-core/clang cmake gtest re2 libfmt dev-vcs/git --getbinpkg diff --git a/docker/gentoo-musl/Dockerfile b/docker/gentoo-musl/Dockerfile new file mode 100644 index 00000000..f00b942b --- /dev/null +++ b/docker/gentoo-musl/Dockerfile @@ -0,0 +1,6 @@ +FROM gentoo/stage3:musl + +RUN emerge --sync +RUN getuto +RUN sed -i 's/^MAKEOPTS=".*"/MAKEOPTS="& -j8"/' /etc/portage/make.conf +RUN emerge llvm-core/clang cmake gtest re2 libfmt dev-vcs/git --getbinpkg diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile new file mode 100644 index 00000000..2124b953 --- /dev/null +++ b/docker/ubuntu/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:latest + +RUN apt update +RUN apt install git cmake clang libre2-10 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which -y diff --git a/test.cpp b/test.cpp deleted file mode 100644 index e69de29b..00000000 From 0263a0fc34c37f43d4ac0eac8c833db2b970153e Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 08:48:45 +0400 Subject: [PATCH 02/24] Add workflow --- .github/workflows/docker-autobuild.yml | 66 ++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .github/workflows/docker-autobuild.yml diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml new file mode 100644 index 00000000..71bf4cef --- /dev/null +++ b/.github/workflows/docker-autobuild.yml @@ -0,0 +1,66 @@ +name: HyperCPU CI/CD Pipeline (update Docker images) + +on: + schedule: + 0 0 * * 0 + push: + branches: + - docker-image-autoupdate + + +permissions: + contents: read + + +jobs: + build: + runs-on: ubuntu-latest + container: hyperwin/hcpu-ci:${{ matrix.config.tag }} + name: "Update ${{ matrix.config.name }} Docker image" + strategy: + matrix: + config: + - tag: fedora + name: Fedora + - tag: debian-stable + name: Debian Stable + - tag: debian-unstable + name: Debian Unstable + - tag: archlinux + name: Arch Linux + - tag: gentoo-glibc + name: Gentoo GLibc + - tag: gentoo-musl + name: Gentoo Musl + - tag: alpine + name: Alpine + - tag: ubuntu + name: Ubuntu + + steps: + - name: Install Docker + uses: docker-practice/actions-setup-docker@master + timeout-minutes: 10 + + - name: Install Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: hyperwin + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 2 + submodules: true + + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: "{{ defaultContext }}:docker/{{ matrix.config.tag }}" + push: true + tag: hyperwin/hcpu-ci:{{ matrix.config.tag }} + From 4332e0f58a218cbfff2694a80a21de3cd1f625c3 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 08:50:21 +0400 Subject: [PATCH 03/24] Fix workflow --- .github/workflows/docker-autobuild.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index 71bf4cef..9c6e63f5 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -1,8 +1,6 @@ name: HyperCPU CI/CD Pipeline (update Docker images) on: - schedule: - 0 0 * * 0 push: branches: - docker-image-autoupdate From 1fb31f4b58e0c8a23ef4b8229940b8dd61b8ae9b Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 08:51:23 +0400 Subject: [PATCH 04/24] Fix workflow --- .github/workflows/docker-autobuild.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index 9c6e63f5..d4470f91 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -2,9 +2,6 @@ name: HyperCPU CI/CD Pipeline (update Docker images) on: push: - branches: - - docker-image-autoupdate - permissions: contents: read From ab61c01cf31aa4197c3376db7ccb7c67e2d51d18 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 08:52:45 +0400 Subject: [PATCH 05/24] Fix workflow --- .github/workflows/docker-autobuild.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index d4470f91..957ceae7 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -10,7 +10,6 @@ permissions: jobs: build: runs-on: ubuntu-latest - container: hyperwin/hcpu-ci:${{ matrix.config.tag }} name: "Update ${{ matrix.config.name }} Docker image" strategy: matrix: From bd76dba55b58383af7546eeddfe0faa672c37b56 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 08:54:56 +0400 Subject: [PATCH 06/24] Fix workflow --- .github/workflows/docker-autobuild.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index 957ceae7..ed3a8a1b 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -32,10 +32,6 @@ jobs: name: Ubuntu steps: - - name: Install Docker - uses: docker-practice/actions-setup-docker@master - timeout-minutes: 10 - - name: Install Docker Buildx uses: docker/setup-buildx-action@v3 From 469c3bb0ab47965a16a5f2a03850208ad89fc9c9 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 08:59:03 +0400 Subject: [PATCH 07/24] Fix workflow --- .github/workflows/docker-autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index ed3a8a1b..c939da03 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -52,5 +52,5 @@ jobs: with: context: "{{ defaultContext }}:docker/{{ matrix.config.tag }}" push: true - tag: hyperwin/hcpu-ci:{{ matrix.config.tag }} + tags: hyperwin/hcpu-ci:{{ matrix.config.tag }} From 2c39729cf414049916b61f27cec30576783a9f34 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 09:00:01 +0400 Subject: [PATCH 08/24] Fix workflow --- .github/workflows/docker-autobuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index c939da03..4461d3b3 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -50,7 +50,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - context: "{{ defaultContext }}:docker/{{ matrix.config.tag }}" + context: "{{ defaultContext }}:docker/${{ matrix.config.tag }}" push: true - tags: hyperwin/hcpu-ci:{{ matrix.config.tag }} + tags: hyperwin/hcpu-ci:${{ matrix.config.tag }} From edddda764df8d8ddcd38c9f73ff1a8a843e516b7 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 09:05:06 +0400 Subject: [PATCH 09/24] Update dockerfiles --- docker/gentoo-glibc/Dockerfile | 4 ++-- docker/gentoo-musl/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/gentoo-glibc/Dockerfile b/docker/gentoo-glibc/Dockerfile index 2bf7447a..3e94eec5 100644 --- a/docker/gentoo-glibc/Dockerfile +++ b/docker/gentoo-glibc/Dockerfile @@ -1,6 +1,6 @@ FROM gentoo/stage3:systemd -RUN emerge --sync +RUN emerge --sync > /dev/null RUN getuto -RUN emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which --getbinpkg +RUN emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which nodejs --getbinpkg RUN source /etc/profile diff --git a/docker/gentoo-musl/Dockerfile b/docker/gentoo-musl/Dockerfile index f00b942b..c0e4712b 100644 --- a/docker/gentoo-musl/Dockerfile +++ b/docker/gentoo-musl/Dockerfile @@ -1,6 +1,6 @@ FROM gentoo/stage3:musl -RUN emerge --sync +RUN emerge --sync > /dev/null RUN getuto RUN sed -i 's/^MAKEOPTS=".*"/MAKEOPTS="& -j8"/' /etc/portage/make.conf -RUN emerge llvm-core/clang cmake gtest re2 libfmt dev-vcs/git --getbinpkg +RUN emerge llvm-core/clang cmake gtest re2 libfmt dev-vcs/git nodejs --getbinpkg From 3eaffcfe5b1cefa5a51a5f2f5a6f2faeaa962ecf Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 09:12:25 +0400 Subject: [PATCH 10/24] Update workflow --- docker/gentoo-glibc/Dockerfile | 2 +- docker/gentoo-musl/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/gentoo-glibc/Dockerfile b/docker/gentoo-glibc/Dockerfile index 3e94eec5..6d4dffc0 100644 --- a/docker/gentoo-glibc/Dockerfile +++ b/docker/gentoo-glibc/Dockerfile @@ -2,5 +2,5 @@ FROM gentoo/stage3:systemd RUN emerge --sync > /dev/null RUN getuto -RUN emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which nodejs --getbinpkg +RUN emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which nodejs --getbinpkg -j2 RUN source /etc/profile diff --git a/docker/gentoo-musl/Dockerfile b/docker/gentoo-musl/Dockerfile index c0e4712b..d29ec708 100644 --- a/docker/gentoo-musl/Dockerfile +++ b/docker/gentoo-musl/Dockerfile @@ -3,4 +3,4 @@ FROM gentoo/stage3:musl RUN emerge --sync > /dev/null RUN getuto RUN sed -i 's/^MAKEOPTS=".*"/MAKEOPTS="& -j8"/' /etc/portage/make.conf -RUN emerge llvm-core/clang cmake gtest re2 libfmt dev-vcs/git nodejs --getbinpkg +RUN emerge llvm-core/clang cmake gtest re2 libfmt dev-vcs/git nodejs --getbinpkg -j2 From 201c9719eea99de10ad0151dad23f5b5d6fb8205 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 11:46:36 +0400 Subject: [PATCH 11/24] Split Gentoo into three stages --- .github/workflows/docker-autobuild.yml | 74 +++++++++++++++++++++- docker/gentoo-musl/{ => stage1}/Dockerfile | 2 +- docker/gentoo-musl/stage2/Dockerfile | 3 + docker/gentoo-musl/stage3/Dockerfile | 3 + 4 files changed, 78 insertions(+), 4 deletions(-) rename docker/gentoo-musl/{ => stage1}/Dockerfile (61%) create mode 100644 docker/gentoo-musl/stage2/Dockerfile create mode 100644 docker/gentoo-musl/stage3/Dockerfile diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index 4461d3b3..892e9f77 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -24,8 +24,6 @@ jobs: name: Arch Linux - tag: gentoo-glibc name: Gentoo GLibc - - tag: gentoo-musl - name: Gentoo Musl - tag: alpine name: Alpine - tag: ubuntu @@ -52,5 +50,75 @@ jobs: with: context: "{{ defaultContext }}:docker/${{ matrix.config.tag }}" push: true - tags: hyperwin/hcpu-ci:${{ matrix.config.tag }} + tags: hyperwin/hcpu-ci:${{ matrix.config.tag }}-build + + build-gentoo-musl-stage1: + runs-on: ubuntu-latest + name: "Update Gentoo Musl Docker image - stage 1" + steps: + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: hyperwin + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 2 + submodules: true + + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: "{{ defaultContext }}:docker/gentoo-musl/stage1" + push: true + tags: hyperwin/hcpu-ci:gentoo-musl-build + + build-gentoo-musl-stage2: + runs-on: ubuntu-latest + name: "Update Gentoo Musl Docker image - stage 2" + needs: build-gentoo-musl-stage1 + steps: + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: hyperwin + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 2 + submodules: true + + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: "{{ defaultContext }}:docker/gentoo-musl/stage2" + push: true + tags: hyperwin/hcpu-ci:gentoo-musl-build + + build-gentoo-musl-stage3: + runs-on: ubuntu-latest + name: "Update Gentoo Musl Docker image - stage 3" + needs: build-gentoo-musl-stage2 + steps: + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: hyperwin + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 2 + submodules: true + + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: "{{ defaultContext }}:docker/gentoo-musl/stage3" + push: true + tags: hyperwin/hcpu-ci:gentoo-musl diff --git a/docker/gentoo-musl/Dockerfile b/docker/gentoo-musl/stage1/Dockerfile similarity index 61% rename from docker/gentoo-musl/Dockerfile rename to docker/gentoo-musl/stage1/Dockerfile index d29ec708..42014acc 100644 --- a/docker/gentoo-musl/Dockerfile +++ b/docker/gentoo-musl/stage1/Dockerfile @@ -3,4 +3,4 @@ FROM gentoo/stage3:musl RUN emerge --sync > /dev/null RUN getuto RUN sed -i 's/^MAKEOPTS=".*"/MAKEOPTS="& -j8"/' /etc/portage/make.conf -RUN emerge llvm-core/clang cmake gtest re2 libfmt dev-vcs/git nodejs --getbinpkg -j2 +RUN emerge llvm-core/llvm cmake gtest re2 libfmt dev-vcs/git --getbinpkg diff --git a/docker/gentoo-musl/stage2/Dockerfile b/docker/gentoo-musl/stage2/Dockerfile new file mode 100644 index 00000000..fbb23d7a --- /dev/null +++ b/docker/gentoo-musl/stage2/Dockerfile @@ -0,0 +1,3 @@ +FROM hyperwin/hcpu-ci:gentoo-musl-build + +RUN emerge llvm-core/clang --getbinpkg diff --git a/docker/gentoo-musl/stage3/Dockerfile b/docker/gentoo-musl/stage3/Dockerfile new file mode 100644 index 00000000..f504c538 --- /dev/null +++ b/docker/gentoo-musl/stage3/Dockerfile @@ -0,0 +1,3 @@ +FROM hyperwin/hcpu-ci:gentoo-musl-build + +RUN emerge nodejs --getbinpkg From 96292ba4281084d94cfebc6d539a6b62b69ad67f Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Wed, 16 Apr 2025 19:27:57 +0400 Subject: [PATCH 12/24] Add NodeJS everywhere --- docker/alpine/Dockerfile | 2 +- docker/archlinux/Dockerfile | 2 +- docker/debian-stable/Dockerfile | 2 +- docker/debian-unstable/Dockerfile | 2 +- docker/fedora/Dockerfile | 2 +- docker/ubuntu/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 5a483539..e2bc2978 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,4 +1,4 @@ FROM alpine:latest RUN apk update -RUN apk add clang gcc git cmake make gtest-dev gtest-src re2 re2-dev fmt fmt-dev +RUN apk add clang gcc git cmake make gtest-dev gtest-src re2 re2-dev fmt fmt-dev nodejs diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile index b371a2dd..ccd8d5f6 100644 --- a/docker/archlinux/Dockerfile +++ b/docker/archlinux/Dockerfile @@ -1,3 +1,3 @@ FROM archlinux:latest -RUN pacman -Syu cmake git clang gcc gtest re2 fmt base-devel --noconfirm +RUN pacman -Syu cmake git clang gcc gtest re2 fmt base-devel nodejs --noconfirm diff --git a/docker/debian-stable/Dockerfile b/docker/debian-stable/Dockerfile index ab2d66db..48ae1633 100644 --- a/docker/debian-stable/Dockerfile +++ b/docker/debian-stable/Dockerfile @@ -1,4 +1,4 @@ FROM debian RUN apt update -RUN apt install git cmake clang libre2-9 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which -y +RUN apt install git cmake clang libre2-9 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which nodejs -y diff --git a/docker/debian-unstable/Dockerfile b/docker/debian-unstable/Dockerfile index eb3d7994..afaa130d 100644 --- a/docker/debian-unstable/Dockerfile +++ b/docker/debian-unstable/Dockerfile @@ -1,4 +1,4 @@ FROM debian:unstable RUN apt update -RUN apt install git cmake clang libre2-11 libre2-dev libfmt10 libfmt-dev libgtest-dev googletest gnu-which -y +RUN apt install git cmake clang libre2-11 libre2-dev libfmt10 libfmt-dev libgtest-dev googletest gnu-which nodejs -y diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index 35307d46..c1d75739 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -1,5 +1,5 @@ FROM fedora RUN dnf update -y -RUN dnf install clang clang-libs gcc gtest gtest-devel fmt fmt-devel re2 re2-devel gtest gtest-devel git cmake libasan which -y +RUN dnf install clang clang-libs gcc gtest gtest-devel fmt fmt-devel re2 re2-devel gtest gtest-devel git cmake libasan which nodejs -y diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 2124b953..88e6419d 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -1,4 +1,4 @@ FROM ubuntu:latest RUN apt update -RUN apt install git cmake clang libre2-10 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which -y +RUN apt install git cmake clang libre2-10 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which nodejs -y From afad169c5ff51a113a726192e8de2b53f428b03d Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Fri, 18 Apr 2025 07:52:00 +0400 Subject: [PATCH 13/24] Fix tag names --- .github/workflows/docker-autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index 892e9f77..3248e5d5 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -50,7 +50,7 @@ jobs: with: context: "{{ defaultContext }}:docker/${{ matrix.config.tag }}" push: true - tags: hyperwin/hcpu-ci:${{ matrix.config.tag }}-build + tags: hyperwin/hcpu-ci:${{ matrix.config.tag }} build-gentoo-musl-stage1: runs-on: ubuntu-latest From 1632929b7b592ed80595d44a0e9d76de67c35321 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Fri, 18 Apr 2025 10:01:40 +0400 Subject: [PATCH 14/24] Update workflows --- .github/workflows/docker-autobuild.yml | 25 +------------------------ docker/alpine/Dockerfile | 2 +- docker/gentoo-musl/stage3/Dockerfile | 3 --- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 docker/gentoo-musl/stage3/Dockerfile diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index 3248e5d5..c6d2533e 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -97,28 +97,5 @@ jobs: with: context: "{{ defaultContext }}:docker/gentoo-musl/stage2" push: true - tags: hyperwin/hcpu-ci:gentoo-musl-build - - build-gentoo-musl-stage3: - runs-on: ubuntu-latest - name: "Update Gentoo Musl Docker image - stage 3" - needs: build-gentoo-musl-stage2 - steps: - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: hyperwin - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 2 - submodules: true - - - name: Build and push - uses: docker/build-push-action@v6 - with: - context: "{{ defaultContext }}:docker/gentoo-musl/stage3" - push: true tags: hyperwin/hcpu-ci:gentoo-musl + diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index e2bc2978..7e964f0d 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,4 +1,4 @@ FROM alpine:latest RUN apk update -RUN apk add clang gcc git cmake make gtest-dev gtest-src re2 re2-dev fmt fmt-dev nodejs +RUN apk add clang gcc git cmake make gtest-dev gtest-src re2 re2-dev fmt fmt-dev nodejs grep diff --git a/docker/gentoo-musl/stage3/Dockerfile b/docker/gentoo-musl/stage3/Dockerfile deleted file mode 100644 index f504c538..00000000 --- a/docker/gentoo-musl/stage3/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM hyperwin/hcpu-ci:gentoo-musl-build - -RUN emerge nodejs --getbinpkg From 1ee0844d1cda27e13940450b810ec4a9cc76dfe2 Mon Sep 17 00:00:00 2001 From: HyperWinX Date: Fri, 18 Apr 2025 13:42:40 +0400 Subject: [PATCH 15/24] Enable cron --- .github/workflows/docker-autobuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index c6d2533e..659a714e 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -1,7 +1,8 @@ name: HyperCPU CI/CD Pipeline (update Docker images) on: - push: + schedule: + - cron: "* * */7 * *" permissions: contents: read From 6985988d539be982e157c6fd90a0ffa3f3a948bd Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:49:06 +0400 Subject: [PATCH 16/24] Update docker-autobuild.yml --- .github/workflows/docker-autobuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index 659a714e..9e1ac660 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -2,7 +2,7 @@ name: HyperCPU CI/CD Pipeline (update Docker images) on: schedule: - - cron: "* * */7 * *" + - cron: "0 0 */7 * *" permissions: contents: read From e0749dc7009f1460ba49d1037ef9c2ca5dc272e4 Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:50:42 +0400 Subject: [PATCH 17/24] Update Dockerfile --- docker/gentoo-glibc/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/gentoo-glibc/Dockerfile b/docker/gentoo-glibc/Dockerfile index 6d4dffc0..47cbe34c 100644 --- a/docker/gentoo-glibc/Dockerfile +++ b/docker/gentoo-glibc/Dockerfile @@ -3,4 +3,3 @@ FROM gentoo/stage3:systemd RUN emerge --sync > /dev/null RUN getuto RUN emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which nodejs --getbinpkg -j2 -RUN source /etc/profile From b148dd8616887894b62cae004007b973c1d37a48 Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:51:15 +0400 Subject: [PATCH 18/24] Update Dockerfile --- docker/alpine/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 7e964f0d..8278b3fd 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,4 +1,4 @@ FROM alpine:latest -RUN apk update -RUN apk add clang gcc git cmake make gtest-dev gtest-src re2 re2-dev fmt fmt-dev nodejs grep +RUN apk update && \ + apk add clang gcc git cmake make gtest-dev gtest-src re2 re2-dev fmt fmt-dev nodejs grep From c3378c2d8f8c585c5821885dd68f4367d7a3f130 Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:51:37 +0400 Subject: [PATCH 19/24] Update Dockerfile --- docker/debian-stable/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/debian-stable/Dockerfile b/docker/debian-stable/Dockerfile index 48ae1633..d48af887 100644 --- a/docker/debian-stable/Dockerfile +++ b/docker/debian-stable/Dockerfile @@ -1,4 +1,4 @@ FROM debian -RUN apt update -RUN apt install git cmake clang libre2-9 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which nodejs -y +RUN apt update && \ + apt install git cmake clang libre2-9 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which nodejs -y From 7bed8d66ad728e447d9d79f18e3cd62d92ca6c92 Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:51:53 +0400 Subject: [PATCH 20/24] Update Dockerfile --- docker/debian-unstable/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/debian-unstable/Dockerfile b/docker/debian-unstable/Dockerfile index afaa130d..2720484f 100644 --- a/docker/debian-unstable/Dockerfile +++ b/docker/debian-unstable/Dockerfile @@ -1,4 +1,4 @@ FROM debian:unstable -RUN apt update -RUN apt install git cmake clang libre2-11 libre2-dev libfmt10 libfmt-dev libgtest-dev googletest gnu-which nodejs -y +RUN apt update && \ + apt install git cmake clang libre2-11 libre2-dev libfmt10 libfmt-dev libgtest-dev googletest gnu-which nodejs -y From 08c559242eab4832fedc8fc272ea59505687f2d4 Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:52:11 +0400 Subject: [PATCH 21/24] Update Dockerfile --- docker/fedora/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index c1d75739..2f133747 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -1,5 +1,5 @@ FROM fedora -RUN dnf update -y -RUN dnf install clang clang-libs gcc gtest gtest-devel fmt fmt-devel re2 re2-devel gtest gtest-devel git cmake libasan which nodejs -y +RUN dnf update -y && \ + dnf install clang clang-libs gcc gtest gtest-devel fmt fmt-devel re2 re2-devel gtest gtest-devel git cmake libasan which nodejs -y From 63136196f6b73fc3a12c870a9dbf78e2192d2b46 Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:52:37 +0400 Subject: [PATCH 22/24] Update Dockerfile --- docker/gentoo-glibc/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/gentoo-glibc/Dockerfile b/docker/gentoo-glibc/Dockerfile index 47cbe34c..bead05b4 100644 --- a/docker/gentoo-glibc/Dockerfile +++ b/docker/gentoo-glibc/Dockerfile @@ -1,5 +1,5 @@ FROM gentoo/stage3:systemd -RUN emerge --sync > /dev/null -RUN getuto -RUN emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which nodejs --getbinpkg -j2 +RUN emerge --sync > /dev/null && \ + getuto && \ + emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which nodejs --getbinpkg -j2 From 4ebf92bd7ff3260042e98e930cfd30b64d5629f7 Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:53:31 +0400 Subject: [PATCH 23/24] Update Dockerfile --- docker/gentoo-musl/stage1/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/gentoo-musl/stage1/Dockerfile b/docker/gentoo-musl/stage1/Dockerfile index 42014acc..f552c572 100644 --- a/docker/gentoo-musl/stage1/Dockerfile +++ b/docker/gentoo-musl/stage1/Dockerfile @@ -1,6 +1,6 @@ FROM gentoo/stage3:musl -RUN emerge --sync > /dev/null -RUN getuto -RUN sed -i 's/^MAKEOPTS=".*"/MAKEOPTS="& -j8"/' /etc/portage/make.conf -RUN emerge llvm-core/llvm cmake gtest re2 libfmt dev-vcs/git --getbinpkg +RUN emerge --sync > /dev/null && \ + getuto && \ + sed -i 's/^MAKEOPTS=".*"/MAKEOPTS="& -j8"/' /etc/portage/make.conf && \ + emerge llvm-core/llvm cmake gtest re2 libfmt dev-vcs/git --getbinpkg From 4f20a4c6dcf7576cf2d8f54b9e8afc0ff500363b Mon Sep 17 00:00:00 2001 From: HyperWin <92534013+HyperWinX@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:54:47 +0400 Subject: [PATCH 24/24] Update Dockerfile --- docker/ubuntu/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 88e6419d..62ba3169 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -1,4 +1,4 @@ FROM ubuntu:latest -RUN apt update -RUN apt install git cmake clang libre2-10 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which nodejs -y +RUN apt update && \ + apt install git cmake clang libre2-10 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which nodejs -y