Skip to content

Commit 16ce9c8

Browse files
committed
Actions Linux 22.04 GCC 10
1 parent da68e8d commit 16ce9c8

File tree

1 file changed

+7
-47
lines changed

1 file changed

+7
-47
lines changed

.github/workflows/of.yml

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ jobs:
374374
scripts/ci/$TARGET/$ARCH/build.sh;
375375
fi
376376
377-
build-linux-64-22-04:
377+
build-linux-22:
378378
runs-on: ubuntu-22.04
379379
strategy:
380380
matrix:
@@ -389,17 +389,18 @@ jobs:
389389
run: if [ "$TARGET" = "linux" ]; then
390390
sudo apt-get remove libunwind-14 -y;
391391
fi
392+
392393
# - name: Cache Packages
393394
# uses: awalsh128/cache-apt-pkgs-action@latest
394395
# with:
395396
# packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 wget2 make 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 libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-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
396397
# version: 1.0
397398

398-
# - uses: actions/checkout@v4.2.2
399-
# - name: ccache
400-
# uses: hendrikmuhs/ccache-action@v1.2.14
401-
# with:
402-
# key: ${{ matrix.cfg.target }}-22-04
399+
- uses: actions/checkout@v4.2.2
400+
- name: ccache
401+
uses: hendrikmuhs/ccache-action@v1.2.14
402+
with:
403+
key: ${{ matrix.cfg.target }}
403404

404405
- name: Install dependencies
405406
run: ./scripts/ci/$TARGET/$ARCH/install.sh;
@@ -416,47 +417,6 @@ jobs:
416417
scripts/ci/$TARGET/$ARCH/build.sh;
417418
fi
418419
419-
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
420-
421-
# build-linux64-2204:
422-
# runs-on: ubuntu-22.04
423-
# strategy:
424-
# matrix:
425-
# cfg:
426-
# - {target: linux64, libs: 64gcc6}
427-
# env:
428-
# TARGET: ${{matrix.cfg.target}}
429-
# steps:
430-
# - name: Remove Old lib-unwind
431-
# run: if [ "$TARGET" = "linux64" ]; then
432-
# sudo apt-get remove libunwind-14 -y;
433-
# fi
434-
# - name: Cache Packages
435-
# uses: awalsh128/cache-apt-pkgs-action@latest
436-
# with:
437-
# packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 wget2 make 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 libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-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
438-
# version: 1.0
439-
440-
# - uses: actions/checkout@v4.2.2
441-
# - name: ccache
442-
# uses: hendrikmuhs/ccache-action@v1.2.14
443-
# with:
444-
# key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
445-
446-
# - name: Download libs
447-
# run: ./scripts/linux/download_libs.sh -a ${{matrix.cfg.libs}}
448-
# - name: Install dependencies
449-
# run: ./scripts/ci/$TARGET/install.sh;
450-
# - name: Build
451-
# run: if [ "$TARGET" = "linux64" ]; then
452-
# scripts/ci/linux64/build.sh;
453-
# scripts/ci/$TARGET/run_tests.sh;
454-
# else
455-
# scripts/ci/$TARGET/build.sh;
456-
# fi
457-
458-
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
459-
460420
build-macos:
461421
runs-on: macos-15
462422
needs: build-linux

0 commit comments

Comments
 (0)