From f53aa70d3d03af4cb0c7acb668aa5f0f90d5a634 Mon Sep 17 00:00:00 2001 From: xenia Date: Sun, 4 Feb 2024 17:12:10 +0100 Subject: [PATCH] Update GitHub workflow --- .github/workflows/fox32-run-cputest.yml | 42 ---------------------- .github/workflows/fox32-unstable-linux.yml | 23 ++++-------- 2 files changed, 6 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/fox32-run-cputest.yml diff --git a/.github/workflows/fox32-run-cputest.yml b/.github/workflows/fox32-run-cputest.yml deleted file mode 100644 index 6ae8425..0000000 --- a/.github/workflows/fox32-run-cputest.yml +++ /dev/null @@ -1,42 +0,0 @@ -on: [push] - -name: run cputest - -jobs: - fox32-run-cputest: - name: Build and test - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Download latest fox32rom artifact - uses: dawidd6/action-download-artifact@v2 - with: - repo: fox32-arch/fox32rom - workflow: fox32rom-unstable.yml - workflow_conclusion: success - - - name: Download latest cputest artifact - uses: dawidd6/action-download-artifact@v2 - with: - repo: fox32-arch/demos - workflow: demos-unstable.yml - workflow_conclusion: success - - - name: Move fox32.rom into the root folder - run: | - mv fox32.rom/ download/ - cp download/fox32.rom ./fox32.rom - - - name: Install libsdl2-dev and vim - run: | - sudo apt update - sudo apt install -y libsdl2-dev vim - - - name: Build - run: make - - - name: Test - run: | - ./fox32 --headless --rom cputest/cputest.bin | tee cputest.log - grep 'All tests passed' cputest.log diff --git a/.github/workflows/fox32-unstable-linux.yml b/.github/workflows/fox32-unstable-linux.yml index a5c48c9..92e6780 100644 --- a/.github/workflows/fox32-unstable-linux.yml +++ b/.github/workflows/fox32-unstable-linux.yml @@ -12,26 +12,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - - name: Download latest fox32rom artifact - uses: dawidd6/action-download-artifact@v2 + - uses: cachix/install-nix-action@v22 with: - repo: fox32-arch/fox32rom - workflow: fox32rom-unstable.yml - workflow_conclusion: success + github_access_token: ${{ secrets.GITHUB_TOKEN }} - - name: Move fox32.rom into the root folder - run: | - mv fox32.rom/ download/ - cp download/fox32.rom ./fox32.rom + - name: Build fox32 + run: nix build -L .#fox32 - - name: Install libsdl2-dev and vim - run: | - sudo apt update - sudo apt install -y libsdl2-dev vim - - - name: Build - run: make + - name: Patch + run: nix run nixpkgs#patchelf -- result/bin/fox32 --set-interpreter /lib64/ld-linux-x86-64.so.2 --output fox32 - name: Upload Artifact uses: actions/upload-artifact@v2