diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2b1c299c1..0920e3b3d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -236,7 +236,7 @@ jobs: - uses: actions/checkout@v4 - name: Install common deps run: | - sudo apt-get install zlib1g zlib1g-dev python3 ninja-build curl + sudo apt-get install zlib1g zlib1g-dev python3 ninja-build curl libcurl4-openssl-dev - name: Install Clang ${{matrix.llvm_version}} run: | @@ -381,6 +381,10 @@ jobs: ./build/c3c init myproject ls myproject + - name: Vendor-fetch + run: | + ./build/c3c vendor-fetch raylib55 + - name: run compiler tests run: | cd test @@ -416,7 +420,7 @@ jobs: - uses: actions/checkout@v4 - name: Install common deps run: | - sudo apt-get install zlib1g zlib1g-dev python3 ninja-build curl + sudo apt-get install zlib1g zlib1g-dev python3 ninja-build curl libcurl4-openssl-dev - name: Install Clang ${{matrix.llvm_version}} run: | @@ -460,6 +464,7 @@ jobs: -DLLVM_ENABLE_LIBXML2=OFF \ -DC3_LLVM_VERSION=${{matrix.llvm_version}}.1 cmake --build build + - name: Compile and run some examples run: | cd resources @@ -506,6 +511,10 @@ jobs: cd resources/testproject ../../build/c3c run -vvv --linker=builtin --trust=full + - name: Vendor-fetch + run: | + ./build/c3c vendor-fetch raylib55 + - name: run compiler tests run: | cd test diff --git a/build-with-docker.sh b/build-with-docker.sh index dc45d39ca..54d1e6cc9 100755 --- a/build-with-docker.sh +++ b/build-with-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash : ${DOCKER:=docker} : ${IMAGE:="c3c-builder"} @@ -41,4 +41,4 @@ exec $DOCKER run -i --rm \ -DCMAKE_DLLTOOL=llvm-dlltool-$LLVM_VERSION \ -DC3_LLVM_VERSION=auto && \ cmake --build build && \ - cp -r build/c3c build/lib bin" \ No newline at end of file + cp -r build/c3c build/lib bin" diff --git a/docker/Dockerfile b/docker/Dockerfile index 1aeb1e02a..8094e09ec 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ ENV LLVM_DEV_VERSION=20 ARG CMAKE_VERSION=3.20 -RUN apt-get update && apt-get install -y wget gnupg software-properties-common zlib1g zlib1g-dev python3 ninja-build curl g++ && \ +RUN apt-get update && apt-get install -y wget gnupg software-properties-common zlib1g zlib1g-dev python3 ninja-build curl g++ libcurl4-openssl-dev && \ wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-$CMAKE_VERSION-linux-x86_64.sh && \ mkdir -p /opt/cmake && \ sh cmake-${CMAKE_VERSION}-linux-x86_64.sh --prefix=/opt/cmake --skip-license && \ @@ -46,4 +46,4 @@ RUN groupadd -g 1337 c3c && \ USER c3c ENV PATH="/opt/cmake/bin:${PATH}" -WORKDIR /home/c3c \ No newline at end of file +WORKDIR /home/c3c