diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37ef119dd0..4384190101 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install dependencies - run: sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list; sudo apt-get update; sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev valgrind + run: | + sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list; sudo apt-get update; + sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev valgrind + ## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev - name: Build v run: | echo $VFLAGS @@ -92,7 +95,8 @@ jobs: ##brew install libpq openssl freetype ### these are *already installed* on Catalina ... brew uninstall --ignore-dependencies libpq ## libpq is a dependency of PHP brew install postgresql - brew install glfw sdl2 sdl2_ttf sdl2_mixer sdl2_image + brew install glfw + ## brew install sdl2 sdl2_ttf sdl2_mixer sdl2_image export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/" - name: Build V run: make -j4 && ./v -cg -o v cmd/v @@ -144,7 +148,11 @@ jobs: with: node-version: 12.x - name: Install dependencies - run: sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list; sudo apt-get update; sudo apt-get install --quiet -y postgresql libpq-dev libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev valgrind + run: | + sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list; + sudo apt-get update; + sudo apt-get install --quiet -y postgresql libpq-dev libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev valgrind + ## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev - name: Build V run: make -j4 && ./v -cc gcc -o v cmd/v # - name: Test V @@ -244,7 +252,11 @@ jobs: # with: # node-version: 12.x # - name: Install dependencies -# run: sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list; sudo apt-get update; sudo apt-get install --quiet -y musl musl-tools libssl-dev sqlite3 libsqlite3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev valgrind +# run: | +# sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list; +# sudo apt-get update; +# sudo apt-get install --quiet -y musl musl-tools libssl-dev sqlite3 libsqlite3-dev valgrind +# sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev # - name: Build v # run: echo $VFLAGS && make -j4 && ./v -cg -o v cmd/v # # - name: Test v binaries @@ -281,8 +293,8 @@ jobs: - name: Install dependencies run: | .\v.exe setup-freetype - .\.github\workflows\windows-install-sdl.bat .\.github\workflows\windows-install-sqlite.bat + ## .\.github\workflows\windows-install-sdl.bat - name: Fixed tests run: | .\v.exe test-fixed @@ -314,8 +326,8 @@ jobs: - name: Install dependencies run: | .\v.exe setup-freetype - .\.github\workflows\windows-install-sdl.bat .\.github\workflows\windows-install-sqlite.bat + ## .\.github\workflows\windows-install-sdl.bat - name: Fixed tests run: | ./v -cg cmd\tools\vtest-fixed.v @@ -352,8 +364,8 @@ jobs: - name: Install dependencies run: | .\v.exe setup-freetype - .\.github\workflows\windows-install-sdl.bat .\.github\workflows\windows-install-sqlite.bat + ## .\.github\workflows\windows-install-sdl.bat - name: Fixed tests run: | .\v.exe test-fixed @@ -409,7 +421,12 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install dependencies - run: sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list; sudo apt-get update; sudo apt-get install --quiet -y postgresql libpq-dev libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev valgrind g++-9 + run: | + sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list; + sudo apt-get update; + sudo apt-get install --quiet -y postgresql libpq-dev libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev + sudo apt-get install --quiet -y valgrind g++-9 + ## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev - name: Build V run: make -j4 - name: g++ version diff --git a/.github/workflows/prebuilt.yml b/.github/workflows/prebuilt.yml index 5cd26a5b67..429d31ee53 100644 --- a/.github/workflows/prebuilt.yml +++ b/.github/workflows/prebuilt.yml @@ -9,7 +9,8 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install --quiet -y postgresql libpq-dev libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev valgrind + sudo apt-get install --quiet -y postgresql libpq-dev libglfw3 libglfw3-dev libfreetype6-dev libssl-dev sqlite3 libsqlite3-dev valgrind + ## sudo apt-get install --quiet -y libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libsdl2-image-dev - name: Download V run: | tag=${GITHUB_REF##*/} @@ -25,7 +26,8 @@ jobs: steps: - name: Install dependencies run: | - brew install freetype glfw openssl sdl2 sdl2_ttf sdl2_mixer sdl2_image + brew install freetype glfw openssl + # brew install sdl2 sdl2_ttf sdl2_mixer sdl2_image export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/" - name: Download V run: | diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 77ae8a5d3e..05ec9cdd4f 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -15,6 +15,6 @@ RUN apk --no-cache add \ openssl-dev sqlite-dev \ libx11-dev glfw-dev freetype-dev -RUN apk --no-cache add --virtual sdl2deps sdl2-dev sdl2_ttf-dev sdl2_mixer-dev sdl2_image-dev +## RUN apk --no-cache add --virtual sdl2deps sdl2-dev sdl2_ttf-dev sdl2_mixer-dev sdl2_image-dev RUN git clone https://github.com/vlang/v /opt/vlang && make && v -version