build: update Dockerfile and CI configuration for improved compatibility and dependencies

Author: frangarcj

.github/workflows/docker.yml

@@ -4,35 +4,65 @@ on:
   pull_request:
     branches:
       - master
+      - gcc-15
   push:
     branches:
       - master
+      - gcc-15
+    tags:
+      - "v*" # Construir también cuando se sube un tag v1.0, etc.
   schedule:
     - cron: "0 0 * * *"
   repository_dispatch:
     types: [run_build]
 
+env:
+  REGISTRY_IMAGE: vitasdk/buildscripts
+
 jobs:
   build:
     runs-on: ubuntu-latest
-  
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-      
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-      
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-      if: github.event_name != 'pull_request'
-    
-    - uses: docker/build-push-action@v3
-      with:
-        push: ${{ github.event_name != 'pull_request' }}
-        tags: vitasdk/buildscripts:latest
+      - uses: actions/checkout@v4
+
+      # Genera tags y labels automáticamente
+      # master -> vitasdk/buildscripts:master, vitasdk/buildscripts:latest
+      # PR #5 -> vitasdk/buildscripts:pr-5
+      # Tag v1.0 -> vitasdk/buildscripts:1.0, vitasdk/buildscripts:latest
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest,enable={{is_default_branch}}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          # Construir para amd64 (estándar) y arm64 (Apple Silicon, RPi)
+          platforms: linux/amd64,linux/arm64
+          # Habilitar caché de GitHub Actions
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

CMakeLists.txt

@@ -220,7 +220,7 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
         URL http://ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.bz2
         URL_HASH ${GMP_HASH}
         DOWNLOAD_DIR ${DOWNLOAD_DIR}
-        CONFIGURE_COMMAND CPPFLAGS=-fexceptions ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
+        CONFIGURE_COMMAND CFLAGS=-std=gnu99 CPPFLAGS=-fexceptions ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
         --build=${build_native}
         --host=${toolchain_host}
         --prefix=${toolchain_deps_dir}

Dockerfile

@@ -1,14 +1,19 @@
 # First stage of Dockerfile
-FROM alpine:3.12
+FROM alpine:latest AS build
+
+RUN apk add build-base cmake git bash autoconf automake libtool texinfo patch pkgconfig python3 && ln -sf python3 /usr/bin/python
 
 COPY . /src
 
-RUN apk add build-base cmake git bash autoconf automake libtool texinfo patch pkgconfig python3 && ln -sf python3 /usr/bin/python
-RUN cd /src && mkdir build && cd build && cmake .. && make -j$(nproc)
+RUN cd /src && mkdir build && cd build && cmake .. && make 
+# -j$(nproc)
 
 # Second stage of Dockerfile
 FROM alpine:latest
 
+# Instalar dependencias en tiempo de ejecución para que la imagen sea útil
+RUN apk add --no-cache bash git make cmake python3
+
 ENV VITASDK /usr/local/vitasdk
 ENV PATH ${VITASDK}/bin:$PATH
 

cmake/GetTriplet.cmake

@@ -9,7 +9,11 @@ function(get_host_triplet triplet)
 
     if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
         string(TOLOWER ${CMAKE_SYSTEM_NAME} host_os)
-        set(host_release "gnu")
+        if(EXISTS "/etc/alpine-release")
+            set(host_release "musl")
+        else()
+            set(host_release "gnu")
+        endif()
     elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
         set(host_os "w64")
         set(host_release "mingw32")
@@ -38,7 +42,11 @@ function(get_build_triplet triplet)
 
     if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
         string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} build_os)
-        set(build_release "gnu")
+        if(EXISTS "/etc/alpine-release")
+            set(build_release "musl")
+        else()
+            set(build_release "gnu")
+        endif()
     elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
         set(build_os "w64")
         set(build_release "mingw32")