diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f17709c..db1ce97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,4 +47,4 @@ jobs: echo "HLNK_LIBRARY3=$(winepath -w $DC_SDK/shc/lib/sh4nlfzn.lib)" >> "$GITHUB_ENV" - name: Build - run: bash scripts/build.sh + run: make diff --git a/.github/workflows/build_matching.yml b/.github/workflows/build_matching.yml index e6588e7..1bb78d4 100644 --- a/.github/workflows/build_matching.yml +++ b/.github/workflows/build_matching.yml @@ -44,4 +44,4 @@ jobs: echo "SHC_INC=$(winepath -w $DC_SDK/shc/include),$(winepath -w $DC_SDK/shinobi/include)" >> "$GITHUB_ENV" - name: Build - run: bash scripts/build_matching.sh + run: make -f Makefile.matching diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a4748d8..9f677ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,16 +17,12 @@ jobs: sudo apt-get update sudo apt-get install -y --no-install-recommends wine wine32:i386 - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.x - tools: composer:v2 - - name: Install sh4objtest run: | - composer global require --no-ansi --no-interaction --no-progress lhsazevedo/sh4objtest:dev-main - echo "$HOME/.config/composer/vendor/bin" >> $GITHUB_PATH + wget -nv https://github.com/lhsazevedo/sh4objtest/releases/latest/download/sh4objtest-linux-x86_64.tar.gz + tar -xzf sh4objtest-linux-x86_64.tar.gz + mv sh4objtest /usr/local/bin/sh4objtest + rm sh4objtest-linux-x86_64.tar.gz - name: Checkout SDK uses: actions/checkout@v4