From 312cfc62594d0c59502f40fb241b67f9746345b6 Mon Sep 17 00:00:00 2001 From: SimonAfek Date: Wed, 12 Jul 2023 09:58:24 +0200 Subject: [PATCH 1/9] Update macOS version in build_interface.yml --- .github/workflows/build_interface.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_interface.yml b/.github/workflows/build_interface.yml index 9dc809c15..6a5ab1315 100644 --- a/.github/workflows/build_interface.yml +++ b/.github/workflows/build_interface.yml @@ -30,7 +30,7 @@ jobs: path: desmume/src/frontend/interface/build/libdesmume.so build_macos: - runs-on: macos-10.15 + runs-on: macos-12 name: Build MacOS steps: - name: Checkout From e218489ddfbcdbb854eb8c2c1b605ea1675da590 Mon Sep 17 00:00:00 2001 From: SimonAfek Date: Wed, 12 Jul 2023 10:02:57 +0200 Subject: [PATCH 2/9] Typo fixes in build_interface.yml --- .github/workflows/build_interface.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_interface.yml b/.github/workflows/build_interface.yml index 6a5ab1315..a45a514a4 100644 --- a/.github/workflows/build_interface.yml +++ b/.github/workflows/build_interface.yml @@ -23,7 +23,7 @@ jobs: - name: Build - ninja run: ninja -C desmume/src/frontend/interface/build - - name: Upload artificat + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: linux @@ -53,7 +53,7 @@ jobs: CC: clang CXX: clang++ - - name: Upload artificat + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: macos @@ -78,7 +78,7 @@ jobs: cd desmume\src\frontend\interface\windows MSBuild.exe DeSmuME_Interface.vcxproj /p:configuration="Release Fastbuild" /p:Platform=${{ matrix.arch }} - - name: Upload artificat + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: win-${{ matrix.arch }} From 4f85c6ab4a06888c97364c85cffe7d6a2d32e1ea Mon Sep 17 00:00:00 2001 From: SimonAfek <18552155+SimonAfek@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:08:41 +0200 Subject: [PATCH 3/9] build.yml: Update runner images --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6fad03c03..946cc9d57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: jobs: build: name: Build DeSmuME (Linux) - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: checkout @@ -26,7 +26,7 @@ jobs: build_gtk2: name: Build DeSmuME (Linux/GTK+2) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: checkout @@ -56,7 +56,7 @@ jobs: build_macos: name: Build DeSmuME (macOS) - runs-on: macOS-11 + runs-on: macos-14 steps: - name: checkout From 0026927c4a302dce0d3001168ec5aff17e5c9ec2 Mon Sep 17 00:00:00 2001 From: SimonAfek <18552155+SimonAfek@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:14:22 +0200 Subject: [PATCH 4/9] build.yml: Update deprecated actions --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 946cc9d57..1f0d7e282 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install dependencies run: sudo apt update && sudo apt install meson libsdl2-dev libpcap-dev libgtk-3-dev @@ -30,7 +30,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: install dependencies run: sudo apt update && sudo apt install autoconf libglu1-mesa-dev libsdl2-dev libpcap-dev libgtk2.0-dev @@ -49,7 +49,7 @@ jobs: tar cJf DeSmuME.tar.xz DeSmuME/ - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: desmume-linux-gtk2-cli-x86_64 path: /tmp/DeSmuME.tar.xz @@ -60,7 +60,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: xcodebuild run: | @@ -73,7 +73,7 @@ jobs: 7z a DeSmuME.app.zip DeSmuME.app - name: Upload artifict - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: macos path: desmume/src/frontend/cocoa/desmume.xcarchive/Products/Applications/DeSmuME.app.zip From 96b139870df9b337e1d71cee117bbbe6984175d9 Mon Sep 17 00:00:00 2001 From: SimonAfek <18552155+SimonAfek@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:17:36 +0200 Subject: [PATCH 5/9] build_interface.yml: Update runner images --- .github/workflows/build_interface.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_interface.yml b/.github/workflows/build_interface.yml index a45a514a4..ec51e2c70 100644 --- a/.github/workflows/build_interface.yml +++ b/.github/workflows/build_interface.yml @@ -6,7 +6,7 @@ on: jobs: build_linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Build Linux steps: - name: Checkout @@ -30,7 +30,7 @@ jobs: path: desmume/src/frontend/interface/build/libdesmume.so build_macos: - runs-on: macos-12 + runs-on: macos-14 name: Build MacOS steps: - name: Checkout @@ -60,7 +60,7 @@ jobs: path: desmume/src/frontend/interface/build/libdesmume.dylib build_windows: - runs-on: windows-2019 + runs-on: windows-2022 name: Build Windows strategy: fail-fast: false From 9ade462ec56d6fc30b8a52110d45b52ca301930a Mon Sep 17 00:00:00 2001 From: SimonAfek <18552155+SimonAfek@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:17:58 +0200 Subject: [PATCH 6/9] build_interface.yml: Update deprecated actions --- .github/workflows/build_interface.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_interface.yml b/.github/workflows/build_interface.yml index ec51e2c70..163102b60 100644 --- a/.github/workflows/build_interface.yml +++ b/.github/workflows/build_interface.yml @@ -10,7 +10,7 @@ jobs: name: Build Linux steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install dependencies run: sudo apt update && sudo apt install meson libsdl2-dev libpcap-dev @@ -24,7 +24,7 @@ jobs: run: ninja -C desmume/src/frontend/interface/build - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux path: desmume/src/frontend/interface/build/libdesmume.so @@ -34,7 +34,7 @@ jobs: name: Build MacOS steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install MacOS build deps run: brew install coreutils gcc sdl2 meson glib @@ -54,7 +54,7 @@ jobs: CXX: clang++ - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: macos path: desmume/src/frontend/interface/build/libdesmume.dylib @@ -68,10 +68,12 @@ jobs: arch: [ 'x64', 'x86' ] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1.0.2 + uses: microsoft/setup-msbuild@v2 + with: + msbuild-architecture: ${{ matrix.arch }} - name: Build run: | @@ -79,7 +81,7 @@ jobs: MSBuild.exe DeSmuME_Interface.vcxproj /p:configuration="Release Fastbuild" /p:Platform=${{ matrix.arch }} - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: win-${{ matrix.arch }} path: desmume/src/frontend/interface/windows/__bins/*.dll From fe2d43f7226c9c0b479014dea63eabface17141e Mon Sep 17 00:00:00 2001 From: SimonAfek <18552155+SimonAfek@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:19:44 +0200 Subject: [PATCH 7/9] build_interface.yml: Remove unnecessary packages from macOS "brew install" line to address warnings --- .github/workflows/build_interface.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_interface.yml b/.github/workflows/build_interface.yml index 163102b60..e86ca8f61 100644 --- a/.github/workflows/build_interface.yml +++ b/.github/workflows/build_interface.yml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@v4 - name: Install MacOS build deps - run: brew install coreutils gcc sdl2 meson glib + run: brew install coreutils sdl2 meson - name: Build - Meson run: | From b503a4561d25c617f129de4291e5866d3a9313c4 Mon Sep 17 00:00:00 2001 From: SimonAfek <18552155+SimonAfek@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:22:19 +0200 Subject: [PATCH 8/9] build_win.yml: Update runner image + remove vs-version parameter from setup-msbuild action --- .github/workflows/build_win.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index c2a698524..bc857071e 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -6,7 +6,7 @@ on: jobs: build-sln: - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v3 @@ -15,7 +15,6 @@ jobs: uses: microsoft/setup-msbuild@v1.1 with: msbuild-architecture: x64 - vs-version: 16.1 - name: Build solution run: | From 4dd29dbf7b87a2cdc3b1f99b749bb62cd28d838f Mon Sep 17 00:00:00 2001 From: SimonAfek <18552155+SimonAfek@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:22:36 +0200 Subject: [PATCH 9/9] build_win.yml: Update deprecated actions --- .github/workflows/build_win.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index bc857071e..3b07c6d2e 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -9,10 +9,10 @@ jobs: runs-on: windows-2022 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.1 + uses: microsoft/setup-msbuild@v2 with: msbuild-architecture: x64 @@ -23,7 +23,7 @@ jobs: cmd /c desmume\src\frontend\windows\ci_postbuild.bat - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: desmume-win-x64 path: desmume/src/frontend/windows/__bins/*.exe