Skip to content

Commit cab81c8

Browse files
igagisigagis
committed
move build stuff to build dir
1 parent 776e1ad commit cab81c8

File tree

70 files changed

+126
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+126
-91
lines changed

‎.github/workflows/ci.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
- {os: ubuntu, codename: noble, image_owner: }
129129
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
130130
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
131-
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
131+
# - {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [ubuntu-24.04-arm]}
132132
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
133133
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
134134
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
@@ -154,13 +154,15 @@ jobs:
154154
uses: myci-actions/checkout@main
155155
- name: set PACKAGE_VERSION
156156
uses: myci-actions/export-env-var@main
157-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
157+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
158158
- name: prepare debian package
159159
run: myci-deb-prepare.sh
160160
- name: install deps
161161
run: myci-deb-install-build-deps.sh
162162
- name: build
163-
run: dpkg-buildpackage --unsigned-source --unsigned-changes
163+
run: |
164+
cd build
165+
dpkg-buildpackage --unsigned-source --unsigned-changes
164166
# - name: publish test report
165167
# uses: EnricoMi/publish-unit-test-result-action/[email protected]
166168
# if: always()
@@ -170,7 +172,7 @@ jobs:
170172
- name: deploy deb packages
171173
run: |
172174
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
173-
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
175+
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
174176
if: startsWith(github.ref, 'refs/tags/')
175177
##### archlinux #####
176178
# archlinux:
@@ -200,7 +202,7 @@ jobs:
200202
# uses: myci-actions/checkout@main
201203
# - name: set PACKAGE_VERSION
202204
# uses: myci-actions/export-env-var@main
203-
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
205+
# with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
204206
# # makepkg needs to install dependency packages, so nobody user needs sudo rights
205207
# - name: add nobody to sudoers
206208
# run: |
@@ -209,12 +211,12 @@ jobs:
209211
# run: |
210212
# # provide write access to user nobody
211213
# chmod --recursive 777 .
212-
# cd archlinux
214+
# cd build/archlinux
213215
# sudo --user=nobody --preserve-env=PACKAGE_VERSION makepkg --syncdeps --noconfirm --skipinteg --noprogressbar
214216
# - name: deploy
215217
# run: |
216218
# echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
217-
# myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/archlinux/${{ matrix.arch }} --database cppfw archlinux/$PACKAGE_NAME-*.pkg.*
219+
# 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.*
218220
# if: startsWith(github.ref, 'refs/tags/')
219221
##### macosx #####
220222
macosx:
@@ -287,7 +289,7 @@ jobs:
287289
uses: myci-actions/checkout@main
288290
- name: set PACKAGE_VERSION
289291
uses: myci-actions/export-env-var@main
290-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
292+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
291293
- name: add cocoapods repo
292294
run: pod repo add --silent cppfw https://[email protected]/cppfw/cocoapods-repo.git
293295
- name: install deps
@@ -308,7 +310,7 @@ jobs:
308310
- name: deploy
309311
run: |
310312
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
311-
myci-deploy-cocoapods-ssh.sh --repo cppfw --version $PACKAGE_VERSION --server gagis.hopto.org --key repo_key_rsa --generic-repo cppfw/cocoapods --package $PACKAGE_NAME-$PACKAGE_VERSION.zip cocoapods/$PACKAGE_NAME.podspec.in
313+
myci-deploy-cocoapods-ssh.sh --repo cppfw --version $PACKAGE_VERSION --server gagis.hopto.org --key repo_key_rsa --generic-repo cppfw/cocoapods --package $PACKAGE_NAME-$PACKAGE_VERSION.zip build/cocoapods/$PACKAGE_NAME.podspec.in
312314
if: startsWith(github.ref, 'refs/tags/')
313315
##### android #####
314316
android:
@@ -326,15 +328,15 @@ jobs:
326328
uses: myci-actions/checkout@main
327329
- name: set PACKAGE_VERSION
328330
uses: myci-actions/export-env-var@main
329-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
331+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
330332
- name: build
331333
run: |
332-
cd android
334+
cd build/android
333335
./gradlew copy_aar --warning-mode all
334336
myci-apply-version.sh --version $PACKAGE_VERSION *.pom.in
335337
myci-apply-version.sh --version $PACKAGE_VERSION *.aar.in --filename-only
336338
- name: deploy
337-
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
339+
run: myci-deploy-maven-nexus.sh --base-url https://gagis.hopto.org/nexus --repo android build/android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
338340
if: startsWith(github.ref, 'refs/tags/')
339341
##### msys2 #####
340342
msys2:
@@ -376,17 +378,17 @@ jobs:
376378
- name: git clone
377379
uses: myci-actions/checkout@main
378380
- name: prepare pacman package
379-
run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
381+
run: myci-apply-version.sh build/msys2/PKGBUILD.in
380382
- name: build
381383
# to make makepkg-mingw build only one architecture we need to set the MINGW_ARCH
382384
env: {MINGW_ARCH: '${{ matrix.repo }}'}
383385
run: |
384-
cd msys2
386+
cd build/msys2
385387
PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
386388
- name: deploy
387389
run: |
388390
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
389-
for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
391+
for f in $(find build/msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
390392
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
391393
done
392394
if: startsWith(github.ref, 'refs/tags/')
@@ -550,12 +552,12 @@ jobs:
550552
uses: myci-actions/checkout@main
551553
- name: set PACKAGE_VERSION
552554
uses: myci-actions/export-env-var@main
553-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
555+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
554556
if: startsWith(github.ref, 'refs/tags/')
555557
- name: build
556558
run: |
557559
conan remote add cppfw $MYCI_CONAN_REMOTE
558-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
560+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
559561
- name: deploy conan package
560562
run: |
561563
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -603,12 +605,12 @@ jobs:
603605
sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
604606
- name: set PACKAGE_VERSION
605607
uses: myci-actions/export-env-var@main
606-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
608+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
607609
if: startsWith(github.ref, 'refs/tags/')
608610
- name: build
609611
run: |
610612
conan remote add cppfw $MYCI_CONAN_REMOTE
611-
conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
613+
conan create build/conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
612614
- name: deploy conan package
613615
run: |
614616
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -649,13 +651,13 @@ jobs:
649651
submodules: false
650652
- name: set PACKAGE_VERSION
651653
uses: myci-actions/export-env-var@main
652-
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
654+
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
653655
if: startsWith(github.ref, 'refs/tags/')
654656
- name: build
655657
run: |
656658
conan remote add cppfw $MYCI_CONAN_REMOTE
657659
# NOTE: specifying empty test folder to skip the test stage
658-
conan create conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
660+
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 ""
659661
- name: deploy conan package
660662
run: |
661663
conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER

‎README.adoc

Lines changed: 1 addition & 1 deletion

‎android/cssom/CMakeLists.txt

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

‎android/.gitignore renamed to ‎build/android/.gitignore

File renamed without changes.

‎android/app/.gitignore renamed to ‎build/android/app/.gitignore

File renamed without changes.

‎android/app/build.gradle renamed to ‎build/android/app/build.gradle

File renamed without changes.

‎android/app/proguard-rules.pro renamed to ‎build/android/app/proguard-rules.pro

File renamed without changes.

‎android/app/src/androidTest/java/io/github/cppfw/cssom_test/ExampleInstrumentedTest.java renamed to ‎build/android/app/src/androidTest/java/io/github/cppfw/cssom_test/ExampleInstrumentedTest.java

File renamed without changes.

‎android/app/src/main/AndroidManifest.xml renamed to ‎build/android/app/src/main/AndroidManifest.xml

File renamed without changes.

‎android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml renamed to ‎build/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

File renamed without changes.

0 commit comments

Comments
 (0)