Skip to content

Commit 31b9e44

Browse files
committed
move build stuff to build dir
1 parent 0cabaa2 commit 31b9e44

21 files changed

+61
-27
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
uses: myci-actions/checkout@main
6262
- name: set PACKAGE_VERSION
6363
uses: myci-actions/export-env-var@main
64-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
64+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
6565
- name: prepare debian package
6666
run: myci-deb-prepare.sh
6767
- name: install deps
@@ -161,17 +161,17 @@ jobs:
161161
- name: git clone
162162
uses: myci-actions/checkout@main
163163
- name: prepare pacman package
164-
run: myci-apply-version.sh -v $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
164+
run: myci-apply-version.sh --version $(myci-deb-version.sh) build/msys2/PKGBUILD.in
165165
- name: build
166166
# to make makepkg-mingw build only one architecture we need to set the MINGW_INSTALLS
167167
env: {MINGW_INSTALLS: '${{ matrix.repo }}'}
168168
run: |
169-
cd msys2
169+
cd build/msys2
170170
PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
171171
- name: deploy
172172
run: |
173173
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
174-
for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
174+
for f in $(find build/msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
175175
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
176176
done
177177
if: startsWith(github.ref, 'refs/tags/')
@@ -335,12 +335,12 @@ jobs:
335335
uses: myci-actions/checkout@main
336336
- name: set PACKAGE_VERSION
337337
uses: myci-actions/export-env-var@main
338-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
338+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
339339
if: startsWith(github.ref, 'refs/tags/')
340340
- name: build
341341
run: |
342342
conan remote add cppfw $MYCI_CONAN_REMOTE
343-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
343+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
344344
- name: deploy conan package
345345
run: |
346346
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -388,12 +388,12 @@ jobs:
388388
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
389389
- name: set PACKAGE_VERSION
390390
uses: myci-actions/export-env-var@main
391-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
391+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
392392
if: startsWith(github.ref, 'refs/tags/')
393393
- name: build
394394
run: |
395395
conan remote add cppfw $MYCI_CONAN_REMOTE
396-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
396+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
397397
- name: deploy conan package
398398
run: |
399399
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -437,13 +437,13 @@ jobs:
437437
submodules: false
438438
- name: set PACKAGE_VERSION
439439
uses: myci-actions/export-env-var@main
440-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
440+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
441441
if: startsWith(github.ref, 'refs/tags/')
442442
- name: build
443443
run: |
444444
conan remote add cppfw $MYCI_CONAN_REMOTE
445445
# NOTE: specifying empty test folder to skip the test stage
446-
conan create conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
446+
conan create build/conan --profile:build default --profile:host build/emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
447447
- name: deploy conan package
448448
run: |
449449
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

debian/control.in renamed to build/debian/control.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
1919
Description: Null renderer for ruis.
2020
Null renderer for ruis GUI library.
2121

22+
Package: libruis-render-null-dbg$(soname)
23+
Section: libs
24+
Architecture: any
25+
Depends:
26+
${shlibs:Depends},
27+
${misc:Depends}
28+
Description: Null renderer for ruis.
29+
Debug version of libruis-render-null.
30+
2231
Package: libruis-render-null$(soname)-dbgsrc
2332
Section: debug
2433
Architecture: all
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/libruis-render-null.so.*

0 commit comments

Comments
 (0)