From 8f380adc4ffea53f636bc9b145153753e5d7c8c7 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sat, 6 Feb 2021 10:23:50 +0100 Subject: [PATCH 1/5] [ci] Fixed checkout and wrong makefile --- .github/workflows/ci-workflow.yml | 26 ++++++++++++++++---------- apps/Makefile | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 0d1297133..a507a454b 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -35,9 +35,9 @@ jobs: android: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 with: - submodules: true + submodules: 'recursive' - run: make -j2 PLATFORM=simulator TARGET=android - uses: actions/upload-artifact@master with: @@ -48,9 +48,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 +89,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,6 +114,8 @@ 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 @@ -129,9 +131,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,9 +143,9 @@ 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: @@ -156,6 +158,8 @@ jobs: 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 @@ -170,6 +174,8 @@ 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 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 \ ) From d35e93901cccdf8162f5b72aea87f58b9c46b322 Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sat, 6 Feb 2021 15:11:54 +0100 Subject: [PATCH 2/5] [ci] Reintroduced 3DS with toggle switch --- .github/workflows/ci-workflow.yml | 39 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index a507a454b..d226d7ad4 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -12,26 +12,31 @@ 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 + nintendo_3ds: + if: github.event.inputs.triggerMacos == '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 + - 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: From 8a45b3d55235fb3a6f5f092f138a1c3c014b7e6f Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sat, 6 Feb 2021 15:44:35 +0100 Subject: [PATCH 3/5] [ci] Moved unit tests to separate workflow --- .github/workflows/ci-workflow.yml | 9 --------- .github/workflows/unit-workflow.yml | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/unit-workflow.yml diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index d226d7ad4..317757aaf 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -123,9 +123,6 @@ jobs: 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 @@ -156,7 +153,6 @@ jobs: 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 @@ -166,9 +162,6 @@ jobs: 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 @@ -182,8 +175,6 @@ jobs: 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 + From ec0e72fcb84b5495e1d9d89d1eaab4d5331cbe3e Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sat, 6 Feb 2021 16:00:53 +0100 Subject: [PATCH 4/5] [ci] Made CI run on push --- .github/workflows/ci-workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 317757aaf..98ff68e81 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: From da3c4a48d09dd99a920fed3b19f5f42f7428ff9c Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Sat, 6 Feb 2021 16:03:08 +0100 Subject: [PATCH 5/5] [ci] Fixed invalid YML --- .github/workflows/ci-workflow.yml | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 98ff68e81..3ab978223 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -20,24 +20,24 @@ on: jobs: nintendo_3ds: - if: github.event.inputs.triggerMacos == '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 + 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 + - 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: