From 054b94b2b759abefead466242dd350bc210e4e6b Mon Sep 17 00:00:00 2001 From: Arisotura Date: Fri, 29 May 2020 22:00:31 +0200 Subject: fix the Github Actions shit, hopefully --- .github/workflows/build-ubuntu.yml | 2 +- .github/workflows/build-windows.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index b57c5b7..6071e33 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -27,7 +27,7 @@ jobs: && tar -zxf cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \ && sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \ && sudo apt-get update \ - && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev + && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index ec14e30..b8e8b04 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -25,7 +25,7 @@ jobs: 7z x -y msys64.7z "-oC:\tools\" C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Syuq --noconfirm" - name: Install dependencies - run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,toolchain}" + run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,toolchain}" - name: Create build environment run: | New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build @@ -33,7 +33,7 @@ jobs: - name: Configure run: | C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \ - && cd melonDS/build && cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}" + && cd melonDS/build && cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DQT5_STATIC_DIR=C:/tools/msys64/mingw64/qt5-static" - name: Make run: | C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \ -- cgit v1.2.3 From b3fad6f819ab1cc3f0b67194a40d73256850dcdf Mon Sep 17 00:00:00 2001 From: Arisotura Date: Sat, 30 May 2020 00:51:50 +0200 Subject: asaddazs sneaky bastard --- .github/workflows/build-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 6071e33..e9307e9 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -40,7 +40,7 @@ jobs: run: | make -j$(nproc --all) \ && mkdir dist \ - && cp {melonDS,romlist.bin} dist + && cp {melonDS} dist - uses: actions/upload-artifact@v1 with: name: melonDS -- cgit v1.2.3 From 993048dd241b59747a7b30edfc861eedd4c005c9 Mon Sep 17 00:00:00 2001 From: Arisotura Date: Sat, 30 May 2020 00:55:34 +0200 Subject: ASGHAFGSHASHJKQHD --- .github/workflows/build-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index e9307e9..efb9604 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -40,7 +40,7 @@ jobs: run: | make -j$(nproc --all) \ && mkdir dist \ - && cp {melonDS} dist + && cp melonDS dist - uses: actions/upload-artifact@v1 with: name: melonDS -- cgit v1.2.3 From 2fab0903447b537021fa5ae6632976b955f5e6ac Mon Sep 17 00:00:00 2001 From: Raphaël Zumer Date: Mon, 8 Jun 2020 18:20:56 +0000 Subject: Update Ubuntu version used for CI Ubuntu 20.04 is supported "as a preview" and may have to be replaced in the future, but 18.04's Qt package is too old to build. --- .github/workflows/build-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index efb9604..4ecdae0 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -15,7 +15,7 @@ env: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 -- cgit v1.2.3 From 4ceb1a2f52498222df014d2ca4c105510ac0752a Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Fri, 12 Jun 2020 02:57:20 +0200 Subject: Add aarch64 CI --- .github/workflows/build-ubuntu-aarch64.yml | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/build-ubuntu-aarch64.yml (limited to '.github') diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml new file mode 100644 index 0000000..edbfbf5 --- /dev/null +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -0,0 +1,47 @@ +name: CMake Build (Ubuntu x86-64) + +on: + push: + branches: + - master + pull_request: + branches: + - master + +env: + BUILD_TYPE: Release + +jobs: + build: + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v1 + - name: Install dependencies + shell: bash + working-directory: ${{runner.workspace}} + run: | + sudo dpkg --add-architecture arm64 \ + sudo sh -c "sed \"s|^deb \([a-z\.:/]*\) \([a-z\-]*\) \(.*\)$|deb [arch=amd64] \1 \2 \3\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports \2 \3|\" /etc/apt/sources.list > /etc/apt/sources.list.new" \ + && sudo rm /etc/apt/sources.list \ + && sudo mv /etc/apt/sources.list{.new,} \ + && sudo apt-get update \ + && sudo apt-get install {gcc,g++,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qt5-default:arm64 + - name: Create build environment + run: mkdir ${{runner.workspace}}/build + - name: Configure + shell: bash + working-directory: ${{runner.workspace}}/build + run: | + CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ cmake -DPKG_CONFIG_EXECUTABLE=/usr/bin/aarch64-linux-gnu-pkg-config $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + - name: Make + shell: bash + working-directory: ${{runner.workspace}}/build + run: | + make -j$(nproc --all) \ + && mkdir dist \ + && cp melonDS dist + - uses: actions/upload-artifact@v1 + with: + name: melonDS + path: ${{runner.workspace}}/build/dist -- cgit v1.2.3 From b05958a4c1b771ad7afb3977def4f8eedc44bcca Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Fri, 12 Jun 2020 03:00:53 +0200 Subject: Correct name and fix syntax error --- .github/workflows/build-ubuntu-aarch64.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index edbfbf5..8476e59 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -1,4 +1,4 @@ -name: CMake Build (Ubuntu x86-64) +name: CMake Build (Ubuntu aarch64) on: push: @@ -22,7 +22,7 @@ jobs: working-directory: ${{runner.workspace}} run: | sudo dpkg --add-architecture arm64 \ - sudo sh -c "sed \"s|^deb \([a-z\.:/]*\) \([a-z\-]*\) \(.*\)$|deb [arch=amd64] \1 \2 \3\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports \2 \3|\" /etc/apt/sources.list > /etc/apt/sources.list.new" \ + && sudo sh -c "sed \"s|^deb \([a-z\.:/]*\) \([a-z\-]*\) \(.*\)$|deb [arch=amd64] \1 \2 \3\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports \2 \3|\" /etc/apt/sources.list > /etc/apt/sources.list.new" \ && sudo rm /etc/apt/sources.list \ && sudo mv /etc/apt/sources.list{.new,} \ && sudo apt-get update \ -- cgit v1.2.3 From 612d3030f21e93d0ba3869a585b7423bb4acb194 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Fri, 12 Jun 2020 03:06:11 +0200 Subject: Use qtbase5-dev so we pull in less stuff --- .github/workflows/build-ubuntu-aarch64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 8476e59..c122e97 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -26,7 +26,7 @@ jobs: && sudo rm /etc/apt/sources.list \ && sudo mv /etc/apt/sources.list{.new,} \ && sudo apt-get update \ - && sudo apt-get install {gcc,g++,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qt5-default:arm64 + && sudo apt-get install {gcc,g++,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure -- cgit v1.2.3 From d69c5df32e2c4309f8e3467ad49c5a74792a6aef Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Fri, 12 Jun 2020 03:21:57 +0200 Subject: Use GCC 10 --- .github/workflows/build-ubuntu-aarch64.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index c122e97..6d0bfde 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -26,14 +26,14 @@ jobs: && sudo rm /etc/apt/sources.list \ && sudo mv /etc/apt/sources.list{.new,} \ && sudo apt-get update \ - && sudo apt-get install {gcc,g++,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 + && sudo apt-get install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure shell: bash working-directory: ${{runner.workspace}}/build run: | - CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ cmake -DPKG_CONFIG_EXECUTABLE=/usr/bin/aarch64-linux-gnu-pkg-config $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + CC=aarch64-linux-gnu-gcc-10 CXX=aarch64-linux-gnu-g++-10 cmake -DPKG_CONFIG_EXECUTABLE=/usr/bin/aarch64-linux-gnu-pkg-config $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE - name: Make shell: bash working-directory: ${{runner.workspace}}/build -- cgit v1.2.3