Skip to content

Commit 7e62090

Browse files
committed
Update CI
1 parent 1db2452 commit 7e62090

File tree

5 files changed

+80
-16
lines changed

5 files changed

+80
-16
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727

2828
jobs:
2929
build-windows-release:
30-
runs-on: windows-2019
30+
runs-on: windows-2022
3131
steps:
3232
- uses: actions/checkout@v4
3333
with:
@@ -39,7 +39,7 @@ jobs:
3939
run: |
4040
mkdir build
4141
cd build
42-
cmake -DCMAKE_BUILD_TYPE=Release .. -A Win32
42+
cmake -DCMAKE_BUILD_TYPE=Release .. -G "Visual Studio 17 2022" -A Win32
4343
cmake --build . --config Release
4444
4545
- name: Create a folder for release
@@ -60,26 +60,20 @@ jobs:
6060
path: dist/*
6161

6262
build-linux-release:
63-
runs-on: ubuntu-20.04
63+
runs-on: ubuntu-latest
6464
steps:
6565
- uses: actions/checkout@v4
6666
with:
6767
clean: true
6868
submodules: recursive
6969
fetch-depth: 0
7070

71-
- name: Install gcc/g++-multilib
72-
run: |
73-
sudo dpkg --add-architecture i386
74-
sudo apt-get update
75-
sudo apt install gcc-9-multilib g++-9-multilib libstdc++-10-dev:i386
76-
7771
- name: Build
7872
run: |
79-
mkdir build
80-
cd build
81-
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32
82-
cmake --build . --parallel $(nproc)
73+
cd docker
74+
chmod +x ./build.sh
75+
chmod +x ./docker-entrypoint.sh
76+
./build.sh
8377
8478
- name: Create a folder for release
8579
shell: bash
@@ -89,8 +83,8 @@ jobs:
8983
mkdir components
9084
mkdir -p qawno/include
9185
cd ..
92-
mv ./build/src/omp-logger.so ./dist/components/omp-logger.so
93-
mv ./omp-logger.inc ./dist/qawno/include/omp-logger.inc
86+
mv docker/build/src/omp-logger.so ./dist/components/omp-logger.so
87+
mv omp-logger.inc ./dist/qawno/include/omp-logger.inc
9488
9589
- name: Upload artifacts
9690
uses: actions/upload-artifact@v4

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19)
1+
cmake_minimum_required(VERSION 3.5)
22
project(omp-logger LANGUAGES C CXX VERSION 0.0.1)
33

44
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/deps/samp-cmake")

docker/Dockerfile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
FROM ubuntu:18.04
2+
RUN \
3+
dpkg --add-architecture i386 && \
4+
apt-get update && \
5+
apt-get install -y \
6+
gpg \
7+
wget \
8+
&& \
9+
wget -O- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
10+
gpg --dearmor - | \
11+
tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null && \
12+
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | \
13+
tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
14+
apt-get update && \
15+
apt-get install -y \
16+
cmake \
17+
g++-multilib \
18+
libstdc++6:i386 \
19+
libc6:i386 \
20+
&& \
21+
useradd -m user
22+
23+
USER user
24+
25+
ENV PATH=~/.local/bin:${PATH}
26+
27+
COPY docker-entrypoint.sh /
28+
CMD /docker-entrypoint.sh

docker/build.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
3+
# Available configs: Debug, RelWithDebInfo, [Release]
4+
[[ -z "$CONFIG" ]] \
5+
&& config=Release \
6+
|| config="$CONFIG"
7+
8+
docker build \
9+
-t omp-logger/build:ubuntu-18.04 ./ \
10+
|| exit 1
11+
12+
folders=('build')
13+
for folder in "${folders[@]}"; do
14+
if [[ ! -d "./${folder}" ]]; then
15+
mkdir ${folder}
16+
fi
17+
sudo chown -R 1000:1000 ${folder} || exit 1
18+
done
19+
20+
docker run \
21+
--rm \
22+
-t \
23+
-w /code \
24+
-v $PWD/..:/code \
25+
-v $PWD/build:/code/build \
26+
-e CONFIG=${config} \
27+
omp-logger/build:ubuntu-18.04

docker/docker-entrypoint.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/sh
2+
[ -z $CONFIG ] && config=Release || config="$CONFIG"
3+
4+
cmake \
5+
-S . \
6+
-B build \
7+
-DCMAKE_BUILD_TYPE=$config \
8+
-DCMAKE_C_FLAGS=-m32 \
9+
-DCMAKE_CXX_FLAGS=-m32 \
10+
-DCMAKE_BUILD_TYPE=$config \
11+
&&
12+
cmake \
13+
--build build \
14+
--config $config \
15+
--parallel $(nproc)

0 commit comments

Comments
 (0)