From 68e310e4ef971b42bb1ab4effd5c49ce1dd58c33 Mon Sep 17 00:00:00 2001 From: Raphaël Zumer Date: Fri, 31 Jul 2020 16:34:28 -0400 Subject: Deploy Qt libraries with dynamic Windows builds Also stop using msys-dist.sh with the static CI build. --- .github/workflows/build-windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index bbf68af..569cebc 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -36,9 +36,8 @@ jobs: - name: Make run: | C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \ - && cd melonDS/build && make -j$(nproc --all) \ - && ../msys-dist.sh" + && cd melonDS/build && make -j$(nproc --all)" - uses: actions/upload-artifact@v1 with: name: melonDS - path: C:\tools\msys64\home\runneradmin\melonDS\build\dist + path: C:\tools\msys64\home\runneradmin\melonDS\build\melonDS.exe -- cgit v1.2.3 From ba0cbc53ca6e80282d63f6fcee2fb28d2ff7975e Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Wed, 26 Aug 2020 14:21:34 +0100 Subject: Update build-ubuntu.yml --- .github/workflows/build-ubuntu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 5974c69..d275f1f 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -24,8 +24,8 @@ jobs: working-directory: ${{runner.workspace}} run: | # Fetch a new version of CMake, because the default is too old. 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 cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev + && sudo apt update \ + && sudo apt install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp0=4.1.0-2ubuntu2.1 libslirp-dev --allow-downgrades - name: Create build environment run: mkdir ${{runner.workspace}}/build - name: Configure -- cgit v1.2.3 From 2850dfed1596f486dbd0a5036631ae3d5bb80b06 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Sat, 19 Sep 2020 17:10:03 +0100 Subject: Fix Ubuntu AArch64 CI (#764) --- .github/workflows/build-ubuntu-aarch64.yml | 1 - 1 file changed, 1 deletion(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 8ece6f2..3d1f309 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -22,7 +22,6 @@ jobs: working-directory: ${{runner.workspace}} run: | sudo apt update - sudo apt full-upgrade - name: Install dependencies shell: bash working-directory: ${{runner.workspace}} -- cgit v1.2.3 From 4b705556bcd3eabaff608ab06b24765472745c21 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 24 Sep 2020 18:17:39 +0100 Subject: Fix Ubuntu AArch64 CI - again (#767) * Fix Ubuntu AArch64 CI - again * Update build-ubuntu-aarch64.yml * Update build-ubuntu-aarch64.yml * Update build-ubuntu-aarch64.yml * Update build-ubuntu-aarch64.yml * Update build-ubuntu-aarch64.yml --- .github/workflows/build-ubuntu-aarch64.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 3d1f309..6fd59b2 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -20,8 +20,11 @@ jobs: - name: Upgrade system shell: bash working-directory: ${{runner.workspace}} - run: | + run: | #Fix grub installation error - https://github.com/actions/virtual-environments/issues/1605 sudo apt update + sudo apt-get install grub-efi + sudo update-grub + sudo apt full-upgrade - name: Install dependencies shell: bash working-directory: ${{runner.workspace}} @@ -31,7 +34,8 @@ jobs: 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 libslirp-dev:arm64 + sudo apt install aptitude + sudo aptitude install -y {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 -- cgit v1.2.3