diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index cde2ddb..b2edc8f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -20,6 +20,7 @@ jobs: run: nproc && make -j$(nproc) - name: check executable (debug) run: | + file gui/qpxtool file gui/qpxtool | grep -q 'x86-64' - name: configure (release) run: make clean && ./configure @@ -27,6 +28,7 @@ jobs: run: nproc && make -j$(nproc) - name: check executable (release) run: | + file gui/qpxtool file gui/qpxtool | grep -q 'x86-64' win64-gui: @@ -51,6 +53,7 @@ jobs: run: nproc && make -j$(nproc) - name: check executable (debug) run: | + file gui/debug/qpxtool.exe file gui/debug/qpxtool.exe | grep -q 'x86-64' - name: configure (release) run: make clean && ./configure @@ -58,6 +61,7 @@ jobs: run: nproc && make -j$(nproc) - name: check executable (release) run: | + file gui/release/qpxtool.exe file gui/release/qpxtool.exe | grep -q 'x86-64' win32-gui: @@ -70,7 +74,7 @@ jobs: with: msystem: MINGW32 update: false - install: git make pkg-config mingw-w64-i686-gcc mingw-w64-i686-qt5 + install: git make pkg-config mingw32/mingw-w64-i686-gcc mingw32/mingw-w64-i686-qt5-base mingw32/mingw-w64-i686-qt5-tools - run: git config --global core.autocrlf input shell: bash - uses: actions/checkout@v4 @@ -82,11 +86,13 @@ jobs: run: nproc && make -j$(nproc) - name: check executable (debug) run: | - file gui/debug/qpxtool.exe | grep -q 'Intel 80386' + file gui/debug/qpxtool.exe + file gui/debug/qpxtool.exe | grep -Eq 'Intel (80|i)386' - name: configure (release) run: make clean && ./configure - name: make (release) run: nproc && make -j$(nproc) - name: check executable (release) run: | - file gui/release/qpxtool.exe | grep -q 'Intel 80386' + file gui/release/qpxtool.exe + file gui/release/qpxtool.exe | grep -q 'Intel (80|i)386' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 774972a..af7ac13 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,6 +29,7 @@ jobs: run: nproc && make -j$(nproc) - name: check executable (debug) run: | + file gui/debug/qpxtool.exe file gui/debug/qpxtool.exe | grep -q 'x86-64' - name: configure (release) run: make clean && ./configure @@ -36,6 +37,7 @@ jobs: run: nproc && make -j$(nproc) - name: check executable (release) run: | + file gui/release/qpxtool.exe file gui/release/qpxtool.exe | grep -q 'x86-64' - name: prepare dist run: ./.github/workflows/make-dist.sh ${{ github.ref }} @@ -56,7 +58,7 @@ jobs: with: msystem: MINGW32 update: false - install: git make pkg-config mingw-w64-i686-gcc mingw-w64-i686-ntldd-git mingw-w64-i686-qt5 mingw-w64-i686-jq zip + install: git make pkg-config mingw32/mingw-w64-i686-gcc mingw32/mingw-w64-i686-ntldd mingw32/mingw-w64-i686-qt5-base mingw32/mingw-w64-i686-qt5-tools mingw32/mingw-w64-i686-jq zip - run: git config --global core.autocrlf input shell: bash - uses: actions/checkout@v4 @@ -68,14 +70,16 @@ jobs: run: nproc && make -j$(nproc) - name: check executable (debug) run: | - file gui/debug/qpxtool.exe | grep -q 'Intel 80386' + file gui/debug/qpxtool.exe + file gui/debug/qpxtool.exe | grep -Eq 'Intel (80|i)386' - name: configure (release) run: make clean && ./configure - name: make (release) run: nproc && make -j$(nproc) - name: check executable (release) run: | - file gui/release/qpxtool.exe | grep -q 'Intel 80386' + file gui/release/qpxtool.exe + file gui/release/qpxtool.exe | grep -Eq 'Intel (80|i)386' - name: prepare dist run: ./.github/workflows/make-dist.sh ${{ github.ref }} id: dist