Skip to content

Commit a1e9be6

Browse files
committed
Workflow ci optimisation VS single ARCH downloads
Actions added 22.04 linux GCC10 test
1 parent 28d50f2 commit a1e9be6

File tree

2 files changed

+49
-4
lines changed

2 files changed

+49
-4
lines changed

.github/workflows/of.yml

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ jobs:
121121
matrix:
122122
platform: [x64, ARM64, ARM64EC]
123123
env:
124-
BITS: ${{ matrix.bits }}
124+
BITS: ${{ matrix.platform }}
125+
ARCH: ${{ matrix.platform }}
126+
125127
steps:
126128
- name: Clone repository
127129
uses: actions/checkout@v4
@@ -322,7 +324,7 @@ jobs:
322324

323325
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
324326

325-
build-linux64:
327+
build-linux-64:
326328
runs-on: ubuntu-24.04
327329
strategy:
328330
matrix:
@@ -366,6 +368,48 @@ jobs:
366368
scripts/ci/$TARGET/$ARCH/build.sh;
367369
fi
368370
371+
build-linux-64-22.04:
372+
runs-on: ubuntu-22.04
373+
strategy:
374+
matrix:
375+
cfg:
376+
- {target: linux, arch: 64, gcc: 10}
377+
env:
378+
TARGET: ${{matrix.cfg.target}}
379+
GCC: ${{matrix.cfg.gcc}}
380+
ARCH: ${{matrix.cfg.arch}}
381+
steps:
382+
- name: Remove Old lib-unwind
383+
run: if [ "$TARGET" = "linux" ]; then
384+
sudo apt-get remove libunwind-14 -y;
385+
fi
386+
- name: Cache Packages
387+
uses: awalsh128/cache-apt-pkgs-action@latest
388+
with:
389+
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
390+
version: 1.0
391+
392+
- uses: actions/checkout@v4
393+
- name: ccache
394+
uses: hendrikmuhs/[email protected]
395+
with:
396+
key: ${{ matrix.cfg.target }}
397+
398+
- name: Install dependencies
399+
run: ./scripts/ci/$TARGET/$ARCH/install.sh;
400+
401+
- name: Download libs
402+
run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.arch}} -g ${{matrix.cfg.GCC}}
403+
404+
- name: Build
405+
run: |
406+
if [ "$TARGET" = "linux" ]; then
407+
scripts/ci/$TARGET/$ARCH/build.sh;
408+
scripts/ci/$TARGET/$ARCH/run_tests.sh;
409+
else
410+
scripts/ci/$TARGET/$ARCH/build.sh;
411+
fi
412+
369413
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
370414

371415
# build-linux64-2204:

scripts/ci/vs/install.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ OF_ROOT=$PWD
33
SCRIPT_DIR="${BASH_SOURCE%/*}"
44

55
RELEASE="${RELEASE:-nightly}"
6+
ARCH="${ARCH:-64}"
67

78
if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi
89
. "$SCRIPT_DIR/../../dev/downloader.sh"
910

1011
unset BITS
1112
cd "${OF_ROOT}"
12-
./scripts/vs/download_libs.sh -p vs --silent -t $RELEASE
13+
./scripts/vs/download_libs.sh -p vs --silent -t $RELEASE -a $ARCH
1314

1415
rm -rf projectGenerator
1516
mkdir -p projectGenerator
@@ -56,4 +57,4 @@ for i in "${!PROJECTS[@]}"; do
5657
echo "Updating: ${PROJECT} with:${PG_OF_PATH}"
5758
#cmd.exe /c "${PG_OF_PATH} ${OPTIONS}"
5859
eval "${PG_OF_PATH} ${OPTIONS}"
59-
done
60+
done

0 commit comments

Comments
 (0)