Skip to content

Commit fd90dd2

Browse files
igagisigagis
committed
cmake: myci
1 parent 372c83b commit fd90dd2

File tree

10 files changed

+59
-91
lines changed

10 files changed

+59
-91
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
matrix:
2121
include:
2222
- {os: debian, codename: bookworm, image_owner: }
23-
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
23+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
24+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
2425
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
2526
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
2627
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -59,24 +60,24 @@ jobs:
5960
include:
6061
# - {os: debian, codename: buster, image_owner: }
6162
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
62-
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
63+
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
6364
# - {os: debian, codename: bullseye, image_owner: }
6465
# - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
65-
# - {os: debian, codename: bullseye, image_owner: , labels: [arm32,docker]}
66-
# - {os: debian, codename: bullseye, image_owner: , labels: [arm64,docker]}
66+
# - {os: debian, codename: bullseye, image_owner: , labels: [ubuntu-24.04-arm]}
67+
# - {os: debian, codename: bullseye, image_owner: , labels: [ubuntu-24.04-arm]}
6768
- {os: debian, codename: bookworm, image_owner: }
6869
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
69-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
70-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
70+
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
71+
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
7172
# - {os: ubuntu, codename: focal, image_owner: }
7273
# - {os: ubuntu, codename: jammy, image_owner: }
7374
- {os: ubuntu, codename: noble, image_owner: }
74-
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm32,docker]}
75-
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
76-
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}
75+
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
76+
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
77+
# - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
7778
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
7879
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
79-
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} - ${{ matrix.labels[0] }}
80+
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
8081
steps:
8182
- name: set TZ for ubuntu:focal
8283
run: |
@@ -127,8 +128,8 @@ jobs:
127128
# matrix:
128129
# include:
129130
# - {image: "archlinux:latest", arch: amd64}
130-
# # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [arm32,docker]}
131-
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [arm64,docker]}
131+
# # - {image: "lopsided/archlinux-arm32v7:latest", arch: arm32, labels: [ubuntu-24.04-arm]}
132+
# - {image: "lopsided/archlinux-arm64v8:latest", arch: arm64, labels: [ubuntu-24.04-arm]}
132133
# runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
133134
# container: ${{ matrix.image }}
134135
# name: linux - archlinux - ${{ matrix.arch }}
@@ -320,11 +321,11 @@ jobs:
320321
include:
321322
- {os: debian, codename: bookworm, image_owner: }
322323
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
323-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
324-
# - {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
324+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
325+
# - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
325326
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
326327
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
327-
name: vcpkg - linux | ${{ matrix.labels[0] }}
328+
name: vcpkg - linux | ${{ matrix.image_owner }}
328329
steps:
329330
- name: add cppfw deb repo
330331
uses: myci-actions/add-deb-repo@main
@@ -350,7 +351,7 @@ jobs:
350351
myci-vcpkg-prepare.sh --git-ref ${{ github.sha }}
351352
- name: test vcpkg port
352353
run: |
353-
cd vcpkg/test
354+
cd build/vcpkg/test
354355
cmake .
355356
make
356357
./test
@@ -359,10 +360,12 @@ jobs:
359360
uses: actions/upload-artifact@v4
360361
with:
361362
name: vcpkg_logs
362-
path: vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
363+
path: |
364+
vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
365+
build/vcpkg/**/*.log
363366
- name: deploy vcpkg port
364367
run: |
365-
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir vcpkg/overlay/${PACKAGE_NAME}
368+
myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir build/vcpkg/overlay/${PACKAGE_NAME}
366369
if: startsWith(github.ref, 'refs/tags/')
367370
##### conan - linux #####
368371
conan-linux:
@@ -373,8 +376,8 @@ jobs:
373376
# - {os: ubuntu, codename: noble, image_owner: }
374377
- {os: debian, codename: bookworm, image_owner: }
375378
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
376-
- {os: debian, codename: bookworm, image_owner: , labels: [arm32,docker]}
377-
- {os: debian, codename: bookworm, image_owner: , labels: [arm64,docker]}
379+
# - {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [ubuntu-24.04-arm]}
380+
# - {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [ubuntu-24.04-arm]}
378381
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
379382
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
380383
name: conan - linux | ${{ matrix.labels[0] }}

‎build/cmake/CMakeLists.txt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
cmake_minimum_required(VERSION 3.20)
2+
3+
set(name tst)
4+
project(${name})
5+
6+
# !!! find_package must go after project() declaration !!!
7+
# Otherwise VCPKG does not set the CMAKE_PREFIX_PATH to find packages.
8+
find_package(myci CONFIG REQUIRED)
9+
10+
set(srcs)
11+
myci_add_source_files(srcs
12+
DIRECTORY
13+
../../src/${name}
14+
RECURSIVE
15+
)
16+
17+
myci_declare_library(${name}
18+
SOURCES
19+
${srcs}
20+
PUBLIC_INCLUDE_DIRECTORIES
21+
../../src/
22+
INSTALL_INCLUDE_DIRECTORIES
23+
../../src/${name}
24+
DEPENDENCIES
25+
utki
26+
clargs
27+
opros
28+
nitki
29+
)

vcpkg/portfile.cmake.in renamed to build/vcpkg/portfile.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ vcpkg_from_github(
99
)
1010

1111
vcpkg_cmake_configure(
12-
SOURCE_PATH "${SOURCE_PATH}/cmake"
12+
SOURCE_PATH "${SOURCE_PATH}/build/cmake"
1313
)
1414

1515
vcpkg_cmake_install()

vcpkg/test/CMakeLists.txt renamed to build/vcpkg/test/CMakeLists.txt

File renamed without changes.

vcpkg/test/main.cpp renamed to build/vcpkg/test/main.cpp

File renamed without changes.

vcpkg/test/vcpkg-configuration.json renamed to build/vcpkg/test/vcpkg-configuration.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
{
99
"kind": "git",
1010
"repository": "https://github.com/cppfw/vcpkg-repo/",
11-
"baseline": "e520eb376507426febb1e46d79e936d187a023c9",
11+
"baseline": "412f8ee0bb8bad56269668ffa00a91a8ddb5e7d3",
1212
"reference": "main",
13-
"packages": [ "utki", "clargs", "opros", "nitki" ]
13+
"packages": [ "myci", "utki", "clargs", "opros", "nitki" ]
1414
}
1515
],
1616
"overlay-ports": [

vcpkg/test/vcpkg.json renamed to build/vcpkg/test/vcpkg.json

File renamed without changes.

vcpkg/usage renamed to build/vcpkg/usage

File renamed without changes.

vcpkg/vcpkg.json.in renamed to build/vcpkg/vcpkg.json.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
"name" : "vcpkg-cmake-config",
1414
"host" : true
1515
},
16+
{
17+
"name" : "myci",
18+
"host" : true
19+
},
1620
"utki",
1721
"clargs",
1822
"nitki"

‎cmake/CMakeLists.txt‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)