From 5f3572edb525ea13b9e3f0651d32d5cd7d406ab7 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 21 Oct 2022 14:22:19 +1100 Subject: [PATCH] Adjusted GitHub CI workflows: (#10452) * Changed Linux GCC build to use the tiny subtarget. * Added chdman and unidasm executables to artefacts. --- .github/workflows/ci-linux.yml | 59 ++++++++++++++++++-------------- .github/workflows/ci-macos.yml | 32 +++++++++-------- .github/workflows/ci-windows.yml | 13 ++++--- src/mame/tiny.lst | 47 ++++++++++++++++++------- 4 files changed, 95 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 9c52b688597..ac23a09b0c9 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -24,6 +24,7 @@ permissions: contents: read jobs: + build-linux: runs-on: ubuntu-latest strategy: @@ -34,32 +35,40 @@ jobs: cc: gcc cxx: g++ archopts: -U_FORTIFY_SOURCE + subtarget: tiny + executable: mametiny - compiler: clang cc: clang cxx: clang++ + subtarget: mame + executable: mame steps: - - uses: actions/checkout@master - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y libsdl2-dev libsdl2-ttf-dev libasound2-dev libxinerama-dev libxi-dev qt5-default - - name: Install clang - if: matrix.compiler == 'clang' - run: sudo apt-get install -y clang - - name: Build - env: - OVERRIDE_CC: ${{ matrix.cc }} - OVERRIDE_CXX: ${{ matrix.cxx }} - ARCHOPTS: ${{ matrix.archopts }} - TOOLS: 1 - run: make -j2 - - name: Validate - run: ./mame -validate - - name: Reconcile driver list - run: ./mame -listxml | python scripts/build/makedep.py reconcilelist -l src/mame/mame.lst - - - name: ORM check - run: python scripts/minimaws/minimaws.py load --executable ./mame --softwarepath hash - - uses: actions/upload-artifact@master - with: - name: mame-linux-${{ matrix.compiler }}-${{ github.sha }} - path: mame + - uses: actions/checkout@master + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y libsdl2-dev libsdl2-ttf-dev libasound2-dev libxinerama-dev libxi-dev qt5-default + - name: Install clang + if: matrix.compiler == 'clang' + run: sudo apt-get install -y clang + - name: Build + env: + OVERRIDE_CC: ${{ matrix.cc }} + OVERRIDE_CXX: ${{ matrix.cxx }} + ARCHOPTS: ${{ matrix.archopts }} + SUBTARGET: ${{ matrix.subtarget }} + TOOLS: 1 + run: make -j2 + - name: Validate + run: ./${{ matrix.executable }} -validate + - name: Reconcile driver list + run: ./${{ matrix.executable }} -listxml | python scripts/build/makedep.py reconcilelist -l src/mame/${{ matrix.subtarget }}.lst - + - name: ORM check + run: python scripts/minimaws/minimaws.py load --executable ./${{ matrix.executable }} --softwarepath hash + - uses: actions/upload-artifact@master + with: + name: ${{ matrix.executable }}-linux-${{ matrix.compiler }}-${{ github.sha }} + path: | + ${{ matrix.executable }} + chdman + unidasm diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 7210f299c17..0e08102bd1e 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -22,20 +22,24 @@ permissions: contents: read jobs: + build-macos: runs-on: macOS-latest steps: - - uses: actions/checkout@master - - name: Install dependencies - run: brew install python3 sdl2 - - name: Build - env: - USE_LIBSDL: 1 - TOOLS: 1 - run: make -j2 - - name: Validate - run: ./mame -validate - - uses: actions/upload-artifact@master - with: - name: mame-macos-${{ github.sha }} - path: mame + - uses: actions/checkout@master + - name: Install dependencies + run: brew install python3 sdl2 + - name: Build + env: + USE_LIBSDL: 1 + TOOLS: 1 + run: make -j2 + - name: Validate + run: ./mame -validate + - uses: actions/upload-artifact@master + with: + name: mame-macos-${{ github.sha }} + path: | + mame + chdman + unidasm diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 7ba30969d4a..aa90a612829 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -36,10 +36,12 @@ jobs: cc: gcc cxx: g++ subtarget: mame + executable: mame - compiler: clang cc: clang cxx: clang++ subtarget: tiny + executable: mametiny steps: - uses: msys2/setup-msys2@v2 with: @@ -48,16 +50,19 @@ jobs: - name: Build env: MINGW64: "/mingw64" - ARCHOPTS: "-fuse-ld=lld" OVERRIDE_AR: "llvm-ar" OVERRIDE_CC: ${{ matrix.cc }} OVERRIDE_CXX: ${{ matrix.cxx }} + ARCHOPTS: "-fuse-ld=lld" SUBTARGET: ${{ matrix.subtarget }} TOOLS: 1 run: make -j2 - name: Validate - run: ./mame* -validate + run: ./${{ matrix.executable }}.exe -validate - uses: actions/upload-artifact@master with: - name: mame-windows-${{ matrix.compiler }}-${{ github.sha }} - path: mame*.exe + name: ${{ matrix.executable }}-windows-${{ matrix.compiler }}-${{ github.sha }} + path: | + ${{ matrix.executable }}.exe + chdman.exe + unidasm.exe diff --git a/src/mame/tiny.lst b/src/mame/tiny.lst index 3ab2084a471..0a58a4a601f 100644 --- a/src/mame/tiny.lst +++ b/src/mame/tiny.lst @@ -9,11 +9,17 @@ ******************************************************************************/ -robby // (c) 1981 Bally Midway -gridlee // [1983 Videa] prototype - no copyright notice -alienar // (c) 1985 Duncan Brown - +@source:exidy/carpolo.cpp carpolo // (c) 1977 Exidy + +@source:exidy/circus.cpp +circus // (c) 1977 Exidy +circuso // (c) 1977 Exidy +robotbwl // (c) 197? Exidy +crash // (c) 1979 Exidy +ripcord // (c) 1979 Exidy + +@source:exidy/exidy.cpp sidetrac // (c) 1979 Exidy targ // (c) 1980 Exidy spectar // (c) 1980 Exidy @@ -21,22 +27,39 @@ teetert // (c) 1982 Exidy hardhat // (c) 1982 fax // (c) 1983 fax2 // (c) 1983 -circus // (c) 1977 Exidy -circuso // (c) 1977 Exidy -robotbwl // (c) 197? Exidy -crash // (c) 1979 Exidy -ripcord // (c) 1979 Exidy + +@source:exidy/starfire.cpp starfire // (c) 1979 Exidy starfirea // (c) 1979 Exidy fireone // (c) 1979 Exidy starfir2 // (c) 1979 Exidy -victory // (c) 1982 -victorba // (c) 1982 + +@source:exidy/vertigo.cpp topgunnr // (c) 1986 +@source:exidy/victory.cpp +victory // (c) 1982 +victorba // (c) 1982 + +@source:gaelco/wrally.cpp +wrally // (c) 1993 - Ref 930705 + +@source:midway/astrocde.cpp +robby // (c) 1981 Bally Midway + +@source:midway/gridlee.cpp +gridlee // [1983 Videa] prototype - no copyright notice + +@source:midway/williams.cpp +alienar // (c) 1985 Duncan Brown + +@source:venture/looping.cpp looping // (c) 1982 Video Games GMBH + +@source:misc/supertnk.cpp supertnk // (c) 1981 VIDEO GAMES GmbH, W.-GERMANY +@source:misc/goldnpkr.cpp witchgme // (c) 1991 Video Klein witchjol // (c) 1994 Video Klein wldwitch // (c) 2001 Video Klein @@ -70,5 +93,3 @@ wstrikea // (c) 1992 Video Klein wtchjack // (c) 1996 Video Klein wtchjacka // (c) 1996 Video Klein wtchjackb // (c) 1996 Video Klein - -wrally // (c) 1993 - Ref 930705