ci: update alpine image

libsese · Oct 6, 2024 · 941ed83 · 941ed83
1 parent 528f8f7
commit 941ed83
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 23 deletions.
diff --git a/.gitlab/ci.yml b/.gitlab/ci.yml
@@ -39,6 +39,7 @@ gtest:
     POSTGRES_HOST_AUTH_METHOD: trust
     PGPASSWORD: $POSTGRES_PASSWORD
     VCPKG_DEFAULT_BINARY_CACHE: $CI_PROJECT_DIR/vcpkg-archives
+    ZIC: /usr/sbin/zic
   image: reg.mikumikumi.xyz/libsese/sese-core:latest
   allow_failure: true
   when: always
@@ -55,8 +56,8 @@ gtest:
       -G Ninja
       -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake
       -DCMAKE_MAKE_PROGRAM=/usr/bin/ninja
-      -DCMAKE_C_COMPILER=/usr/bin/clang-17
-      -DCMAKE_CXX_COMPILER=/usr/bin/clang++-17
+      -DCMAKE_C_COMPILER=/usr/bin/gcc
+      -DCMAKE_CXX_COMPILER=/usr/bin/g++
       -Bbuild/linux-release
       -DCMAKE_BUILD_TYPE=Release
       -DSESE_BUILD_TEST=ON

diff --git a/README.md b/README.md
@@ -5,19 +5,17 @@
 <img src="static/image/logo.svg" width="128" height="128" alt="logo"/>
 </div>
 <div align="center">
-<img src="https://img.shields.io/static/v1?label=license&message=Apache-2.0&color=purple&logo=Apache" alt="license"/>
-<img src="https://img.shields.io/static/v1?label=language&message=C%2B%2B%2020&color=purple&logo=cplusplus" alt="lang"/>
-<img src="https://img.shields.io/static/v1?label=build%20system&message=CMake&color=purple&logo=cmake" alt="buildsystem"/>
+<img src="https://img.shields.io/static/v1?label=license&message=Apache-2.0&color=blue&logo=Apache" alt="license"/>
+<img src="https://img.shields.io/static/v1?label=language&message=C%2B%2B%2020&color=blue&logo=cplusplus" alt="lang"/>
+<img src="https://img.shields.io/static/v1?label=build%20system&message=CMake&color=blue&logo=cmake" alt="buildsystem"/>
+<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Flibsese%2Fsese?ref=badge_small" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Flibsese%2Fsese.svg?type=small"/></a>
 <br>
 <img alt="CodeFactor Status" src="https://www.codefactor.io/repository/github/libsese/sese/badge"/>
 <img alt="Lines of Code" src="https://sloc.xyz/github/libsese/sese/"/>
-<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/windows-2022.yml?label=Windows&logo=windows">
-<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/ubuntu-2204-apt.yml?label=Ubuntu&logo=ubuntu">
-<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/macos-12-brew.yml?label=macOS&logo=apple">
+<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/windows.yml?label=Windows&logo=windows">
+<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/ubuntu.yml?label=Ubuntu&logo=ubuntu">
+<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/macos.yml?label=macOS&logo=apple">
 <br>
-
-<i style="color: red">Development, testing, and release have been suspended due to lack of macOS physical devices.</i>
-
 </div>
 
 ## Intro

diff --git a/README.zh_CN.md b/README.zh_CN.md
@@ -5,19 +5,17 @@
 <img src="static/image/logo.svg" width="128" height="128" alt="logo"/>
 </div>
 <div align="center">
-<img src="https://img.shields.io/static/v1?label=license&message=Apache-2.0&color=purple&logo=Apache" alt="license"/>
-<img src="https://img.shields.io/static/v1?label=language&message=C%2B%2B%2020&color=purple&logo=cplusplus" alt="lang"/>
-<img src="https://img.shields.io/static/v1?label=build%20system&message=CMake&color=purple&logo=cmake" alt="buildsystem"/>
+<img src="https://img.shields.io/static/v1?label=license&message=Apache-2.0&color=blue&logo=Apache" alt="license"/>
+<img src="https://img.shields.io/static/v1?label=language&message=C%2B%2B%2020&color=blue&logo=cplusplus" alt="lang"/>
+<img src="https://img.shields.io/static/v1?label=build%20system&message=CMake&color=blue&logo=cmake" alt="buildsystem"/>
+<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Flibsese%2Fsese?ref=badge_small" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Flibsese%2Fsese.svg?type=small"/></a>
 <br>
 <img alt="CodeFactor Status" src="https://www.codefactor.io/repository/github/libsese/sese/badge"/>
 <img alt="Lines of Code" src="https://sloc.xyz/github/libsese/sese/"/>
-<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/windows-2022.yml?label=Windows&logo=windows">
-<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/ubuntu-2204-apt.yml?label=Ubuntu&logo=ubuntu">
-<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/macos-12-brew.yml?label=macOS&logo=apple">
+<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/windows.yml?label=Windows&logo=windows">
+<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/ubuntu.yml?label=Ubuntu&logo=ubuntu">
+<img alt="GitHub Workflow Status (with event)" src="https://img.shields.io/github/actions/workflow/status/libsese/sese/macos.yml?label=macOS&logo=apple">
 <br>
-
-<i style="color: red">由于缺少 macOS 物理设备，开发、测试和发布已暂停</i>
-
 </div>
 
 ## 简介

diff --git a/docker/alpine-x64.dockerfile b/docker/alpine-x64.dockerfile
@@ -1,8 +1,8 @@
 FROM amd64/alpine:3.20.1
 
-RUN apk add samurai ninja-build autoconf automake git cmake llvm17 clang17 clang17-extra-tools compiler-rt
+RUN apk add samurai autoconf automake git cmake gcc compiler-rt pkgconfig linux-headers bison flex tzdata-utils
 
-RUN apk add libtool python3 py3-pip
+RUN apk add libtool python3 py3-pip bash
 
 RUN apk add doxygen mariadb-client postgresql-client
 

diff --git a/vcpkg.json b/vcpkg.json
@@ -5,7 +5,7 @@
   "homepage": "https://github.com/libsese/sese",
   "license": "Apache-2.0",
   "supports": "x64 & (windows | osx | linux) & !uwp",
-  "builtin-baseline": "1de2026f28ead93ff1773e6e680387643e914ea1",
+  "builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289",
   "dependencies": [
     {
       "name": "asio",