Skip to content

Commit a720202

Browse files
authored
update actions, ccache, make -j2 and Ubuntu 24.04
1 parent 8e88955 commit a720202

3 files changed

Lines changed: 21 additions & 4 deletions

File tree

.github/workflows/build-linux.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ on:
1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
1313
cancel-in-progress: true
14-
14+
15+
env:
16+
ccache: ccache
17+
1518
jobs:
1619
build-linux:
17-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-24.04
1821
strategy:
1922
matrix:
2023
cfg:
@@ -25,6 +28,11 @@ jobs:
2528
- name: Install libunwind
2629
run: sudo apt-get install libunwind-dev
2730
- uses: actions/checkout@v4
31+
- name: ccache
32+
uses: hendrikmuhs/ccache-action@v1.2.12
33+
with:
34+
# key: ${{ matrix.os }}-${{ matrix.type }}
35+
key: ${{ matrix.os }}-${{ matrix.cfg.target }}
2836
- name: Build
2937
run:
3038
./scripts/linux/buildPG.sh;

.github/workflows/build-macos.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,26 @@ concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
1313
cancel-in-progress: true
1414

15+
env:
16+
ccache: ccache
17+
1518
jobs:
1619
build-macos:
1720
runs-on: macos-latest
1821
strategy:
1922
matrix:
2023
cfg:
21-
- {target: osx}
24+
- { target: osx }
2225
env:
2326
TARGET: ${{ matrix.cfg.target }}
2427
steps:
2528
- uses: actions/checkout@v4
29+
- name: ccache
30+
uses: hendrikmuhs/ccache-action@v1.2.12
31+
with:
32+
# key: ${{ matrix.os }}-${{ matrix.type }}
33+
key: ${{ matrix.os }}-${{ matrix.cfg.target }}
34+
2635
- uses: actions/setup-node@v4
2736
with:
2837
node-version: 16

scripts/linux/buildPG.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export LC_ALL=C
1313
OF_ROOT=./
1414

1515
cd ${OF_ROOT}/apps/projectGenerator
16-
make Release -C ./commandLine
16+
make -j2 Release -C ./commandLine
1717
ret=$?
1818
if [ $ret -ne 0 ]; then
1919
echo "Failed building Project Generator"

0 commit comments

Comments
 (0)