Skip to content

Commit 7610a77

Browse files
committed
Merge branch 'main' into c_api
2 parents 03859a2 + ba4cf72 commit 7610a77

File tree

3 files changed

+39
-23
lines changed

3 files changed

+39
-23
lines changed

.github/workflows/docs.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
build:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2
11-
- uses: actions/setup-python@v2
10+
- uses: actions/checkout@v3
11+
- uses: actions/setup-python@v4
1212
with:
1313
python-version: "3.9"
1414
architecture: "x64"
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
1919
- name: build docs
20-
uses: mattnotmitt/[email protected].2
20+
uses: mattnotmitt/[email protected].5
2121
with:
2222
doxyfile-path: 'Doxyfile'
2323
- name: Deploy

.github/workflows/fdp_cpp_api.yaml

+35-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: FDP C++ API
22

3-
on: [push]
3+
on: [push, workflow_dispatch]
44

55
jobs:
66
Build_Ubuntu:
@@ -9,8 +9,8 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
steps:
12-
- uses: actions/checkout@v2
13-
- uses: actions/setup-python@v2
12+
- uses: actions/checkout@v3
13+
- uses: actions/setup-python@v4
1414
with:
1515
python-version: "3.9"
1616
architecture: "x64"
@@ -20,7 +20,7 @@ jobs:
2020
- name: Install local registry
2121
run: curl -fsSL https://data.scrc.uk/static/localregistry.sh | /bin/bash -s -- -b main
2222
- name: Checkout FAIRDataPipeline/FAIR-CLI
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v3
2424
with:
2525
repository: FAIRDataPipeline/FAIR-CLI
2626
path: FAIR-CLI
@@ -47,7 +47,7 @@ jobs:
4747
run: |
4848
cmake -Bbuild -DFDPAPI_BUILD_TESTS=ON -DFDPAPI_CODE_COVERAGE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=install
4949
- name: Fetch cache
50-
uses: actions/cache@v2.1.5
50+
uses: actions/cache@v3
5151
with:
5252
path: sonarCache
5353
key: ${{ runner.os }}-sonarCache-${{ github.sha }}
@@ -98,7 +98,7 @@ jobs:
9898
strategy:
9999
fail-fast: false
100100
steps:
101-
- uses: actions/checkout@v2
101+
- uses: actions/checkout@v3
102102
- name: Install Dependencies
103103
run: |
104104
brew install cmake
@@ -120,7 +120,7 @@ jobs:
120120
strategy:
121121
fail-fast: false
122122
steps:
123-
- uses: actions/checkout@v2
123+
- uses: actions/checkout@v3
124124
- uses: ilammy/msvc-dev-cmd@v1
125125
- name: Configure Library
126126
run: |
@@ -134,25 +134,41 @@ jobs:
134134
cmake --build build_from_install --config=Release
135135
Build_GCC_4_8:
136136
name: Build GCC 4.8
137-
runs-on: ubuntu-18.04
138-
steps:
139-
- uses: actions/checkout@v2
140-
- uses: actions/setup-python@v2
137+
runs-on: ubuntu-latest
138+
container:
139+
image: ubuntu:18.04
140+
options: --user root
141+
steps:
142+
- uses: actions/setup-python@v4
141143
with:
142144
python-version: "3.9"
143145
architecture: "x64"
144-
- name: Set up GCC
145-
uses: egor-tensin/setup-gcc@v1
146-
with:
147-
version: 4.8
148-
platform: x64
146+
- name: Setup GCC 4.8
147+
run: |
148+
apt update
149+
apt install build-essential libssl-dev git -y
150+
git clone https://github.com/Kitware/CMake/
151+
cd CMake
152+
./bootstrap && make && make install
153+
cmake --version
154+
apt install g++-4.8 gcc-4.8 -y
155+
rm /usr/bin/gcc
156+
rm /usr/bin/g++
157+
ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
158+
ln -s /usr/bin/g++-4.8 /usr/bin/g++
159+
gcc --version
160+
g++ --version
161+
cmake --version
162+
- uses: actions/checkout@v3
149163
- name: Install Dependencies
150164
run: |
151-
sudo apt update
152-
sudo apt install -y lcov curl libcurl4-openssl-dev gcovr
165+
apt install -y lcov curl libcurl4-openssl-dev gcovr
153166
- name: Configure Library
154167
run: |
168+
cd $GITHUB_WORKSPACE
169+
ls
155170
cmake -Bbuild
156171
- name: Build Library
157-
run: |
172+
run: |
173+
cd $GITHUB_WORKSPACE
158174
cmake --build build

.github/workflows/test_with_simple_model.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: C++ Test Simple Model
22

3-
on: [push]
3+
on: [push, workflow_dispatch]
44

55
jobs:
66
Test_Simple_Model:

0 commit comments

Comments
 (0)