Skip to content

Commit 85ee5da

Browse files
committed
msys: move to build dir
1 parent d7ef6bb commit 85ee5da

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,17 @@ jobs:
274274
- name: git clone
275275
uses: myci-actions/checkout@main
276276
- name: prepare pacman package
277-
run: myci-apply-version.sh --version $(myci-deb-version.sh) msys2/PKGBUILD.in
277+
run: myci-apply-version.sh --version $(myci-deb-version.sh) build/msys2/PKGBUILD.in
278278
- name: build
279279
# to make makepkg-mingw build only one architecture we need to set the MINGW_ARCH
280280
env: {MINGW_ARCH: '${{ matrix.repo }}'}
281281
run: |
282-
cd msys2
282+
cd build/msys2
283283
PKGEXT='.pkg.tar.xz' makepkg-mingw --syncdeps --noconfirm --skipinteg
284284
- name: deploy
285285
run: |
286286
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
287-
for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
287+
for f in $(find build/msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
288288
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
289289
done
290290
if: startsWith(github.ref, 'refs/tags/')
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ noextract=()
5757
md5sums=()
5858
validpgpkeys=()
5959

60-
rootDir=$(pwd)/.. # project root directory
60+
rootDir=$(pwd)/../.. # project root directory
6161

6262
prepare() {
6363
cd "$rootDir"

0 commit comments

Comments
 (0)