Skip to content

Commit 5f4fba6

Browse files
committed
move build stuff to build dir
1 parent 6cbb0a6 commit 5f4fba6

File tree

29 files changed

+112
-54
lines changed

29 files changed

+112
-54
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,15 @@ jobs:
100100
uses: myci-actions/checkout@main
101101
- name: set PACKAGE_VERSION
102102
uses: myci-actions/export-env-var@main
103-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
103+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
104104
- name: prepare debian package
105105
run: myci-deb-prepare.sh
106106
- name: install deps
107107
run: myci-deb-install-build-deps.sh
108108
- name: build
109-
run: dpkg-buildpackage --unsigned-source --unsigned-changes
109+
run: |
110+
cd build
111+
dpkg-buildpackage --unsigned-source --unsigned-changes
110112
- name: publish test report
111113
uses: mikepenz/action-junit-report@v2.4.0
112114
with:
@@ -119,7 +121,7 @@ jobs:
119121
- name: deploy deb packages
120122
run: |
121123
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
122-
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.*deb
124+
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.*deb
123125
if: startsWith(github.ref, 'refs/tags/')
124126
##### archlinux #####
125127
# archlinux:
@@ -149,7 +151,7 @@ jobs:
149151
# uses: myci-actions/checkout@main
150152
# - name: set PACKAGE_VERSION
151153
# uses: myci-actions/export-env-var@main
152-
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
154+
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
153155
# # makepkg needs to install dependency packages, so nobody user needs sudo rights
154156
# - name: add nobody to sudoers
155157
# run: |
@@ -158,12 +160,12 @@ jobs:
158160
# run: |
159161
# # provide write access to user nobody
160162
# chmod --recursive 777 .
161-
# cd archlinux
163+
# cd build/archlinux
162164
# sudo --user=nobody --preserve-env=PACKAGE_VERSION makepkg --syncdeps --noconfirm --skipinteg --noprogressbar
163165
# - name: deploy
164166
# run: |
165167
# echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
166-
# myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/archlinux/${{ matrix.arch }} --database cppfw archlinux/$PACKAGE_NAME-*.pkg.*
168+
# myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/archlinux/${{ matrix.arch }} --database cppfw build/archlinux/$PACKAGE_NAME-*.pkg.*
167169
# if: startsWith(github.ref, 'refs/tags/')
168170
##### macosx #####
169171
macosx:
@@ -260,12 +262,12 @@ jobs:
260262
- name: git clone
261263
uses: myci-actions/checkout@main
262264
- name: prepare pacman package
263-
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
265+
run: myci-apply-version.sh build/msys2/PKGBUILD.in
264266
- name: build
265267
# to make makepkg-mingw build only one architecture we need to set the MINGW_ARCH
266268
env: {MINGW_ARCH: '${{ matrix.repo }}'}
267269
run: |
268-
cd msys2
270+
cd build/msys2
269271
PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
270272
- name: publish test report
271273
uses: mikepenz/action-junit-report@v2.3.0
@@ -277,7 +279,7 @@ jobs:
277279
- name: deploy
278280
run: |
279281
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
280-
for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
282+
for f in $(find build/msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
281283
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
282284
done
283285
if: startsWith(github.ref, 'refs/tags/')
@@ -449,13 +451,13 @@ jobs:
449451
uses: myci-actions/checkout@main
450452
- name: set PACKAGE_VERSION
451453
uses: myci-actions/export-env-var@main
452-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
454+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
453455
if: startsWith(github.ref, 'refs/tags/')
454456
- name: build
455457
run: |
456458
conan remote add cppfw $MYCI_CONAN_REMOTE
457459
conan cache clean
458-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --update
460+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --update
459461
- name: deploy conan package
460462
run: |
461463
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -503,13 +505,13 @@ jobs:
503505
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
504506
- name: set PACKAGE_VERSION
505507
uses: myci-actions/export-env-var@main
506-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
508+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
507509
if: startsWith(github.ref, 'refs/tags/')
508510
- name: build
509511
run: |
510512
conan remote add cppfw $MYCI_CONAN_REMOTE
511513
conan cache clean
512-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --update
514+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --update
513515
- name: deploy conan package
514516
run: |
515517
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ noextract=()
3333
md5sums=()
3434
validpgpkeys=()
3535

36-
rootDir=$(pwd)/.. # project root directory
36+
rootDir=$(pwd)/../.. # project root directory
3737

3838
prepare() {
3939
cd "$rootDir"
File renamed without changes.
File renamed without changes.
Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,43 @@ Standards-Version: 3.9.2
1919
Package: libtst$(soname)
2020
Section: libs
2121
Architecture: any
22-
Depends: ${shlibs:Depends}, ${misc:Depends}
22+
Depends:
23+
${shlibs:Depends},
24+
${misc:Depends}
2325
Description: C++ test framework.
24-
C++ test framework for unit and other tests.
26+
C++ test framework for unit and other tests.
2527

26-
Package: libtst$(soname)-dbg
27-
Section: debug
28+
Package: libtst-dbg$(soname)
29+
Section: libs
2830
Architecture: any
29-
Depends: libtst$(soname) (= ${binary:Version}), ${misc:Depends}
30-
Description: debugging symbols for libtst$(soname) package.
31+
Depends:
32+
${shlibs:Depends},
33+
${misc:Depends}
34+
Description: C++ test framework.
35+
Debug version of libtst.
3136

3237
Package: libtst-dev
3338
Section: libdevel
3439
Architecture: any
35-
Depends: libtst$(soname) (= ${binary:Version}), libtst$(soname)-dbg (= ${binary:Version}), ${misc:Depends},
36-
libutki-dev (>= 1.1.128),
37-
libclargs-dev
40+
Depends:
41+
libtst$(soname) (= ${binary:Version}),
42+
libtst-dbg$(soname) (= ${binary:Version}),
43+
${misc:Depends},
44+
libutki-dev (>= 1.1.128),
45+
libclargs-dev
3846
Suggests: libtst-doc
3947
Description: C++ test framework.
4048
C++ test framework for unit and other tests.
4149

50+
Package: libtst$(soname)-dbgsrc
51+
Section: debug
52+
Architecture: all
53+
Depends:
54+
libtst$(soname)-dbgsym (= ${binary:Version}),
55+
libtst-dbg$(soname)-dbgsym (= ${binary:Version}),
56+
${misc:Depends}
57+
Description: debugging sources for libtst$(soname) package.
58+
4259
Package: libtst-doc
4360
Section: doc
4461
Architecture: all
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/libtst.so.*

0 commit comments

Comments
 (0)