Skip to content

Commit 725ef86

Browse files
committed
move build stuff to build dir
1 parent 2538c57 commit 725ef86

File tree

14 files changed

+29
-16
lines changed

14 files changed

+29
-16
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ jobs:
5454
- name: install deps
5555
run: myci-deb-install-build-deps.sh
5656
- name: build
57-
run: dpkg-buildpackage --unsigned-source --unsigned-changes
57+
run: |
58+
cd build
59+
dpkg-buildpackage --unsigned-source --unsigned-changes
5860
- name: deploy deb packages
5961
run: |
6062
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
61-
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.deb
63+
myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.deb
6264
if: startsWith(github.ref, 'refs/tags/')
6365
##### archlinux #####
6466
# archlinux:
@@ -97,12 +99,12 @@ jobs:
9799
# run: |
98100
# # provide write access to user nobody
99101
# chmod --recursive 777 .
100-
# cd archlinux
102+
# cd build/archlinux
101103
# sudo --user=nobody --preserve-env=PACKAGE_VERSION makepkg --syncdeps --noconfirm --skipinteg --noprogressbar
102104
# - name: deploy
103105
# run: |
104106
# echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
105-
# myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/archlinux/${{ matrix.arch }} --database cppfw archlinux/$PACKAGE_NAME-*-any.pkg.*
107+
# myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/archlinux/${{ matrix.arch }} --database cppfw build/archlinux/$PACKAGE_NAME-*-any.pkg.*
106108
# if: startsWith(github.ref, 'refs/tags/')
107109
##### macosx #####
108110
macosx:
@@ -163,15 +165,15 @@ jobs:
163165
- name: git clone
164166
uses: myci-actions/checkout@main
165167
- name: prepare pacman package
166-
run: myci-apply-version.sh msys2/PKGBUILD.in
168+
run: myci-apply-version.sh build/msys2/PKGBUILD.in
167169
- name: build
168170
run: |
169-
cd msys2
171+
cd build/msys2
170172
makepkg --syncdeps --noconfirm --skipinteg
171173
- name: deploy
172174
run: |
173175
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
174-
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/msys --database cppfw_msys msys2/$PACKAGE_NAME-*-any.pkg.*
176+
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/msys --database cppfw_msys build/msys2/$PACKAGE_NAME-*-any.pkg.*
175177
if: startsWith(github.ref, 'refs/tags/')
176178
##### mingw #####
177179
msys2-mingw:
@@ -246,7 +248,7 @@ jobs:
246248
- name: build
247249
run: |
248250
conan remote add cppfw $MYCI_CONAN_REMOTE
249-
conan create conan --build-require --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
251+
conan create build/conan --build-require --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
250252
- name: deploy conan package
251253
run: |
252254
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
File renamed without changes.
File renamed without changes.
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@ Source: prorab
22
Section: misc
33
Priority: extra
44
Maintainer: Ivan Gagis <[email protected]>
5-
Build-Depends: debhelper (>= 9), make,
6-
dos2unix,
7-
g++,
8-
lsb-release,
9-
myci,
10-
clang-tidy
5+
Build-Depends:
6+
debhelper (>= 9),
7+
make,
8+
dos2unix,
9+
g++,
10+
lsb-release,
11+
myci,
12+
clang-tidy
1113
Standards-Version: 3.9.2
1214

1315
Package: prorab
1416
Section: devel
1517
Architecture: all
1618
Depends: sed, make, diffutils
1719
Description: GNU make based build system.
18-
GNU make based build system mainly for C++ programs.
19-
Defines building sequences for applications, libraries, debian packages.
20+
GNU make based build system mainly for C++ programs.
21+
Defines building sequences for applications, libraries, debian packages.

build/debian/prorab.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/include/*

debian/rules renamed to build/debian/rules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/usr/bin/make -f
2+
3+
$(info SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH))
4+
25
%:
36
dh $@
47

0 commit comments

Comments
 (0)