diff --git a/.github/workflows/actions/build-emscripten.yml b/.github/workflows/actions/build-emscripten.yml index 5bb4ab211d7..d4154c62de4 100644 --- a/.github/workflows/actions/build-emscripten.yml +++ b/.github/workflows/actions/build-emscripten.yml @@ -27,18 +27,16 @@ jobs: matrix: cfg: - {target: emscripten} - env: - TARGET: ${{matrix.cfg.target}} steps: - uses: actions/checkout@v4 - name: Docker Step run: "docker run -di --name emscripten -v $PWD:/src emscripten/emsdk:3.1.21 bash" - name: Download libs - run: ./scripts/$TARGET/download_libs.sh + run: ./scripts/${{matrix.cfg.target}}/download_libs.sh - name: Install dependencies - run: ./scripts/ci/$TARGET/install.sh + run: ./scripts/ci/${{matrix.cfg.target}}/install.sh - name: Build - run: docker exec -i emscripten sh -c "scripts/ci/$TARGET/build.sh"; + run: docker exec -i emscripten sh -c "scripts/ci/${{matrix.cfg.target}}/build.sh"; - name: Upload Libs run: scripts/ci/upload_of_lib.sh; env: diff --git a/.github/workflows/actions/build-ios-tvos.yml b/.github/workflows/actions/build-ios-tvos.yml index 15c11a17f21..5e33ea15b77 100644 --- a/.github/workflows/actions/build-ios-tvos.yml +++ b/.github/workflows/actions/build-ios-tvos.yml @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} diff --git a/.github/workflows/actions/build-linux64.yml b/.github/workflows/actions/build-linux64.yml index ac77fe78066..763673336ae 100644 --- a/.github/workflows/actions/build-linux64.yml +++ b/.github/workflows/actions/build-linux64.yml @@ -37,12 +37,12 @@ jobs: - name: Cache Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good + packages: wget2 make curl libunwind-dev libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good version: 1.0 - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} diff --git a/.github/workflows/actions/build-macos.yml b/.github/workflows/actions/build-macos.yml index 3af292c8652..9b69bd43b39 100644 --- a/.github/workflows/actions/build-macos.yml +++ b/.github/workflows/actions/build-macos.yml @@ -31,7 +31,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: # key: ${{ matrix.os }}-${{ matrix.type }} key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }} diff --git a/.github/workflows/actions/build-msys2.yml b/.github/workflows/actions/build-msys2.yml index 743c0f219da..09c1f9ece53 100644 --- a/.github/workflows/actions/build-msys2.yml +++ b/.github/workflows/actions/build-msys2.yml @@ -34,7 +34,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: # key: ${{ matrix.os }}-${{ matrix.type }} key: ${{ matrix.msystem }} diff --git a/.github/workflows/actions/build-rpi.yml b/.github/workflows/actions/build-rpi.yml index cc4654e59cf..502d30a1131 100644 --- a/.github/workflows/actions/build-rpi.yml +++ b/.github/workflows/actions/build-rpi.yml @@ -36,13 +36,13 @@ jobs: - name: Cache Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} + packages: wget2 multistrap unzip gcc-${{matrix.cfg.suffix}} g++-${{matrix.cfg.suffix}} version: 1.0 - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: key: ${{ matrix.cfg.libs }} diff --git a/.github/workflows/manual-nightly.yml b/.github/workflows/manual-nightly.yml index f4599c7bb50..0440e8bb01d 100644 --- a/.github/workflows/manual-nightly.yml +++ b/.github/workflows/manual-nightly.yml @@ -20,7 +20,8 @@ jobs: - name: Cache Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: make curl libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good + packages: aptitude wget2 + # packages: make curl libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good # libunwind-dev version: 1.0 diff --git a/.github/workflows/nightly-linux64.yml b/.github/workflows/nightly-linux64.yml index 42a38bf2d63..d3e2928b641 100644 --- a/.github/workflows/nightly-linux64.yml +++ b/.github/workflows/nightly-linux64.yml @@ -19,7 +19,7 @@ jobs: - name: Cache Packages uses: awalsh128/cache-apt-pkgs-action@latest with: - packages: make curl libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good + packages: aptitude wget2 make curl libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good # libunwind-dev version: 1.0 diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index 5c2f70e6d9f..eeb7f427827 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -59,7 +59,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: # key: ${{ matrix.os }}-${{ matrix.type }} key: ${{ matrix.msystem }} @@ -158,7 +158,7 @@ jobs: - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: key: ${{ matrix.cfg.libs }} @@ -184,7 +184,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} @@ -222,7 +222,7 @@ jobs: - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }} @@ -255,7 +255,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: ccache - uses: hendrikmuhs/ccache-action@v1.2.12 + uses: hendrikmuhs/ccache-action@v1.2.13 with: # key: ${{ matrix.os }}-${{ matrix.type }} key: ${{ matrix.cfg.target }}-${{ matrix.cfg.opt }}