From acb1eec35d25c3af857cea5762d5ab0f5f24a5b8 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sat, 25 Jul 2020 20:26:36 +0200 Subject: Windows CI: Install MSYS2 with chocolatey --- .github/workflows/build-windows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index b8e8b04..035bc54 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -21,8 +21,7 @@ jobs: - name: Install MSYS2 working-directory: ${{runner.workspace}} run: | # Fetch MSYS2 build from XQEmu. Official distribution causes a CI failure due to permission errors. - Invoke-WebRequest -Uri "https://github.com/xqemu/ci-environment-msys2/releases/latest/download/msys64.7z" -OutFile "msys64.7z" - 7z x -y msys64.7z "-oC:\tools\" + choco install msys2 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,qt5-static,toolchain}" -- cgit v1.2.3 From 8a1964a75cf4cf89d373c7bba5116abc1d48b549 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 26 Jul 2020 21:43:01 +0200 Subject: Add libslirp to workflows --- .github/workflows/build-ubuntu-aarch64.yml | 2 +- .github/workflows/build-ubuntu.yml | 2 +- .github/workflows/build-windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 6d0bfde..c242c57 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-10,g++-10,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 libslirp-dev:arm64 - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 4ecdae0..4483483 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 qt5-default + && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev - 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 035bc54..bbf68af 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -24,7 +24,7 @@ jobs: choco install msys2 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,qt5-static,toolchain}" + run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libslirp,toolchain}" - name: Create build environment run: | New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build -- cgit v1.2.3 From c9b9f43fbf7ff0367d16d81269e38c3b618bfa65 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 26 Jul 2020 21:48:01 +0200 Subject: Remove unneeded gtk3 package from the Ubuntu build --- .github/workflows/build-ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 4483483..fb3e576 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 qt5-default libslirp-dev + && sudo apt-get install libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure -- cgit v1.2.3 From c547db21e9d41f3a1897ce3ab4872b8aa7f8d31f Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Sun, 26 Jul 2020 21:52:35 +0200 Subject: Don't download CMake, the package is new enough --- .github/workflows/build-ubuntu.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index fb3e576..5974c69 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -23,17 +23,15 @@ jobs: shell: bash working-directory: ${{runner.workspace}} run: | # Fetch a new version of CMake, because the default is too old. - wget -nv https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \ - && 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 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 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev + && sudo apt-get install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure shell: bash working-directory: ${{runner.workspace}}/build - run: ${{runner.workspace}}/cmake-$CMAKE_VERSION-Linux-x86_64/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE - name: Make shell: bash working-directory: ${{runner.workspace}}/build -- cgit v1.2.3 From 5c08207f359479fdd16fa8517f9d2a5e8fe52c63 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Mon, 27 Jul 2020 15:56:43 +0200 Subject: Do full upgrade to avoid issues when installing ARM dependencies --- .github/workflows/build-ubuntu-aarch64.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 6d0bfde..e6d4a87 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -17,16 +17,22 @@ jobs: steps: - uses: actions/checkout@v1 + - name: Upgrade system + shell: bash + working-directory: ${{runner.workspace}} + run: | + sudo apt update + sudo apt full-upgrade - 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-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 + 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 update + sudo apt 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 -- cgit v1.2.3