@@ -61,15 +61,15 @@ 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
6868 run : myci-deb-install-build-deps.sh
6969 - name : build
7070 run : |
71+ cd build
7172 dpkg-buildpackage --unsigned-source --unsigned-changes
72- mv ../*.*deb .
7373 - name : deploy deb packages
7474 run : |
7575 echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
@@ -163,45 +163,20 @@ jobs:
163163 - name : git clone
164164 uses : myci-actions/checkout@main
165165 - name : prepare pacman package
166- run : myci-apply-version.sh -v $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
166+ run : myci-apply-version.sh --version $(myci-deb-version.sh) build/ msys2/PKGBUILD.in
167167 - name : build
168168 # to make makepkg-mingw build only one architecture we need to set the MINGW_INSTALLS
169169 env : {MINGW_INSTALLS: '${{ matrix.repo }}'}
170170 run : |
171- cd msys2
171+ cd build/ msys2
172172 PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
173173 - name : deploy
174174 run : |
175175 echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
176- for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
176+ for f in $(find build/ msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
177177 myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
178178 done
179179 if : startsWith(github.ref, 'refs/tags/')
180- # #### msvs ##### DEPRECATED
181- # msvs:
182- # runs-on: windows-latest
183- # defaults:
184- # run:
185- # shell: powershell
186- # steps:
187- # - name: git clone
188- # uses: actions/checkout@v2
189- # - name: install CoAPP tools
190- # uses: myci-actions/install-coapp-tools@main
191- # - name: nuget update
192- # run: |
193- # nuget restore msvs_solution/msvs_solution.sln
194- # nuget update msvs_solution/msvs_solution.sln
195- # - name: add msbuild to PATH
196- # uses: microsoft/setup-msbuild@v1.0.2
197- # - name: build
198- # run: .\nuget\build_nuget.ps1
199- # - name: deploy
200- # uses: myci-actions/publish-nuget@main
201- # with:
202- # filename: '.\nuget\*.nupkg'
203- # api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
204- # if: startsWith(github.ref, 'refs/tags/')
205180# #### vcpkg-linux #####
206181 vcpkg-linux :
207182 strategy :
@@ -337,12 +312,12 @@ jobs:
337312 # uses: myci-actions/checkout@main
338313 # - name: set PACKAGE_VERSION
339314 # uses: myci-actions/export-env-var@main
340- # with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog )}
315+ # with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
341316 # if: startsWith(github.ref, 'refs/tags/')
342317 # - name: build
343318 # run: |
344319 # conan remote add cppfw $MYCI_CONAN_REMOTE
345- # conan create conan --build=missing --conf tools.system.package_manager:mode=install --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
320+ # conan create build/ conan --build=missing --conf tools.system.package_manager:mode=install --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
346321 # - name: deploy conan package
347322 # run: |
348323 # conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -390,12 +365,12 @@ jobs:
390365 # sed -i -E "s/compiler.cppstd=.*$/compiler.cppstd=17/g" ~/.conan2/profiles/default
391366 # - name: set PACKAGE_VERSION
392367 # uses: myci-actions/export-env-var@main
393- # with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog )}
368+ # with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
394369 # if: startsWith(github.ref, 'refs/tags/')
395370 # - name: build
396371 # run: |
397372 # conan remote add cppfw $MYCI_CONAN_REMOTE
398- # conan create conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
373+ # conan create build/ conan --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION
399374 # - name: deploy conan package
400375 # run: |
401376 # conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
@@ -439,13 +414,13 @@ jobs:
439414 # submodules: false
440415 # - name: set PACKAGE_VERSION
441416 # uses: myci-actions/export-env-var@main
442- # with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog )}
417+ # with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh)}
443418 # if: startsWith(github.ref, 'refs/tags/')
444419 # - name: build
445420 # run: |
446421 # conan remote add cppfw $MYCI_CONAN_REMOTE
447422 # # NOTE: specifying empty test folder to skip the test stage
448- # conan create conan --profile:build default --profile:host emscripten/conan.profile --build=missing --user $MYCI_CONAN_USER --channel main --version $PACKAGE_VERSION --test-folder ""
423+ # 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 ""
449424 # - name: deploy conan package
450425 # run: |
451426 # conan remote login --password $MYCI_CONAN_PASSWORD cppfw $MYCI_CONAN_USER
0 commit comments