|
61 | 61 | uses: myci-actions/checkout@main
|
62 | 62 | - name: set PACKAGE_VERSION
|
63 | 63 | 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)} |
65 | 65 | - name: prepare debian package
|
66 | 66 | run: myci-deb-prepare.sh
|
67 | 67 | - name: install deps
|
@@ -161,17 +161,17 @@ jobs:
|
161 | 161 | - name: git clone
|
162 | 162 | uses: myci-actions/checkout@main
|
163 | 163 | - 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 |
165 | 165 | - name: build
|
166 | 166 | # to make makepkg-mingw build only one architecture we need to set the MINGW_INSTALLS
|
167 | 167 | env: {MINGW_INSTALLS: '${{ matrix.repo }}'}
|
168 | 168 | run: |
|
169 |
| - cd msys2 |
| 169 | + cd build/msys2 |
170 | 170 | PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
|
171 | 171 | - name: deploy
|
172 | 172 | run: |
|
173 | 173 | 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 |
175 | 175 | myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
|
176 | 176 | done
|
177 | 177 | if: startsWith(github.ref, 'refs/tags/')
|
@@ -335,12 +335,12 @@ jobs:
|
335 | 335 | uses: myci-actions/checkout@main
|
336 | 336 | - name: set PACKAGE_VERSION
|
337 | 337 | 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)} |
339 | 339 | if: startsWith(github.ref, 'refs/tags/')
|
340 | 340 | - name: build
|
341 | 341 | run: |
|
342 | 342 | 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 |
344 | 344 | - name: deploy conan package
|
345 | 345 | run: |
|
346 | 346 | conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
|
@@ -388,12 +388,12 @@ jobs:
|
388 | 388 | sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
|
389 | 389 | - name: set PACKAGE_VERSION
|
390 | 390 | 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)} |
392 | 392 | if: startsWith(github.ref, 'refs/tags/')
|
393 | 393 | - name: build
|
394 | 394 | run: |
|
395 | 395 | 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 |
397 | 397 | - name: deploy conan package
|
398 | 398 | run: |
|
399 | 399 | conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
|
@@ -437,13 +437,13 @@ jobs:
|
437 | 437 | submodules: false
|
438 | 438 | - name: set PACKAGE_VERSION
|
439 | 439 | 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)} |
441 | 441 | if: startsWith(github.ref, 'refs/tags/')
|
442 | 442 | - name: build
|
443 | 443 | run: |
|
444 | 444 | conan remote add cppfw $MYCI_CONAN_REMOTE
|
445 | 445 | # 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 "" |
447 | 447 | - name: deploy conan package
|
448 | 448 | run: |
|
449 | 449 | conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
|
|
0 commit comments