diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 0d1297133..3ab978223 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -1,6 +1,7 @@ name: Continuous integration #on: [pull_request, push] on: + push: pull_request: workflow_dispatch: inputs: @@ -12,32 +13,37 @@ on: description: 'Run macOS tests' required: true default: 'no' + trigger3DS: + description: 'Run 3DS tests' + required: true + default: 'no' jobs: - # nintendo_3ds: - # runs-on: ubuntu-latest - # steps: - # - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb - # - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb - # - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru - # - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro - # - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM - # - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH - - # - uses: actions/checkout@v1 - # with: - # submodules: true - # - run: make -j2 PLATFORM=simulator TARGET=3ds - # - uses: actions/upload-artifact@master - # with: - # name: epsilon-3ds.3dsx - # path: output/release/simulator/3ds/epsilon.3dsx - android: + nintendo_3ds: + if: github.event.inputs.trigger3DS == 'yes' runs-on: ubuntu-latest steps: + - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb + - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb + - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru + - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro + - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM + - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH + - uses: actions/checkout@v1 with: submodules: true + - run: make -j2 PLATFORM=simulator TARGET=3ds + - uses: actions/upload-artifact@master + with: + name: epsilon-3ds.3dsx + path: output/release/simulator/3ds/epsilon.3dsx + android: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: 'recursive' - run: make -j2 PLATFORM=simulator TARGET=android - uses: actions/upload-artifact@master with: @@ -48,9 +54,9 @@ jobs: steps: - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config - uses: numworks/setup-arm-toolchain@2020-q2 - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: - submodules: true + submodules: 'recursive' - run: mkdir final-output - run: make -j2 MODEL=n0100 EPSILON_I18N=en output/release/device/n0100/epsilon.onboarding.two_binaries - run: mv output/release/device/n0100/epsilon.onboarding.internal.bin final-output/epsilon.onboarding.internal.en.bin @@ -89,9 +95,9 @@ jobs: steps: - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config - uses: numworks/setup-arm-toolchain@2020-q2 - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: - submodules: true + submodules: 'recursive' - run: make -j2 epsilon.dfu - run: make -j2 epsilon.onboarding.dfu - run: make -j2 epsilon.onboarding.update.dfu @@ -114,11 +120,10 @@ jobs: steps: - uses: msys2/setup-msys2@v2 - uses: actions/checkout@v2 + with: + submodules: 'recursive' - run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng - run: make -j2 PLATFORM=simulator - - run: make -j2 PLATFORM=simulator epsilon.official.exe - - run: make -j2 PLATFORM=simulator test.headless.exe - - run: output/release/simulator/windows/test.headless.exe - uses: actions/upload-artifact@master with: name: epsilon-windows.exe @@ -129,9 +134,9 @@ jobs: - uses: numworks/setup-emscripten@v1 with: sdk: latest-upstream - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: - submodules: true + submodules: 'recursive' - run: make -j2 PLATFORM=simulator TARGET=web - uses: actions/upload-artifact@master with: @@ -141,25 +146,23 @@ jobs: runs-on: ubuntu-latest steps: - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: - submodules: true + submodules: 'recursive' - run: make -j2 PLATFORM=simulator - uses: actions/upload-artifact@master with: name: epsilon-linux.bin path: output/release/simulator/linux/epsilon.bin - - run: make -j2 PLATFORM=simulator test.headless.bin macos: if: github.event.inputs.triggerMacos == 'yes' runs-on: macOS-latest steps: - run: brew install numworks/tap/epsilon-sdk - uses: actions/checkout@v2 + with: + submodules: 'recursive' - run: make -j2 PLATFORM=simulator - - run: make -j2 PLATFORM=simulator epsilon.official.app - - run: make -j2 PLATFORM=simulator ARCH=x86_64 test.headless.bin - - run: output/release/simulator/macos/x86_64/test.headless.bin - uses: actions/upload-artifact@master with: name: epsilon-macos.zip @@ -170,9 +173,9 @@ jobs: steps: - run: brew install numworks/tap/epsilon-sdk - uses: actions/checkout@v2 + with: + submodules: 'recursive' - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 - - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 epsilon.official.ipa - - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 test.ipa - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 APPLE_PLATFORM=ios-simulator - uses: actions/upload-artifact@master with: diff --git a/.github/workflows/unit-workflow.yml b/.github/workflows/unit-workflow.yml new file mode 100644 index 000000000..e4076aa63 --- /dev/null +++ b/.github/workflows/unit-workflow.yml @@ -0,0 +1,14 @@ +name: Unit tests +on: [pull_request_target] + +jobs: + units: + runs-on: ubuntu-latest + steps: + - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config + - uses: actions/checkout@v2 + with: + submodules: 'recursive' + - run: make -j2 PLATFORM=simulator test.headless.bin + - run: output/release/simulator/linux/test.headless.bin + diff --git a/apps/Makefile b/apps/Makefile index 1d7242030..6cea5268d 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -43,7 +43,7 @@ apps_src += $(addprefix apps/,\ ) tests_src += $(addprefix apps/,\ - exam_mode_configuration_official.cpp \ + exam_mode_configuration_non_official.cpp \ )