From 5a654aaaa4b75a8bb40af181dfe71be457f8e554 Mon Sep 17 00:00:00 2001
From: ShadelessFox <35821147+ShadelessFox@users.noreply.github.com>
Date: Tue, 8 Oct 2024 16:22:36 +0300
Subject: [PATCH] Remove Java 8 toolchain

---
 .github/workflows/build.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61afa2d1ee..e069211a13 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,11 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         config: 
-          - { name: Linux x86, runner-os: ubuntu-latest, ws: gtk, os: linux, arch: x86_64, native-extension: so }
-          - { name: Windows x86, runner-os: windows-2019, ws: win32, os: win32, arch: x86_64, native-extension: dll }
-          - { name: macOS x86, runner-os: macos-13, ws: cocoa, os: macosx, arch: x86_64, native-extension: so }
-          - { name: macOS ARM, runner-os: macos-14, ws: cocoa, os: macosx, arch: aarch64, native-extension: so }
-    name: Build ${{ matrix.config.name }}
+          - { name: Linux, runner-os: ubuntu-latest, ws: gtk, os: linux, arch: x86_64, native-extension: so }
+          - { name: Windows, runner-os: windows-2019, ws: win32, os: win32, arch: x86_64, native-extension: dll }
+          - { name: macOS, runner-os: macos-13, ws: cocoa, os: macosx, arch: x86_64, native-extension: so }
+          - { name: macOS, runner-os: macos-14, ws: cocoa, os: macosx, arch: aarch64, native-extension: so }
+    name: Build ${{ matrix.config.name }} {{ matrix.config.arch }}
     runs-on: ${{ matrix.config.runner-os }}
     defaults:
       run: # Run on cmd on Windows because powershell interprets dots in arguments differently
@@ -40,10 +40,8 @@ jobs:
       uses: actions/setup-java@v4
       with:
         java-version: |
-          8
           17
         mvn-toolchain-id: |
-          JavaSE-1.8
           JavaSE-17
         distribution: 'temurin'
         cache: maven
@@ -74,12 +72,12 @@ jobs:
       uses: actions/upload-artifact@v4
       if: success()
       with:
-        name: ${{ matrix.config.name }} launcher artifacts
+        name: ${{ matrix.config.name }} {{ matrix.config.arch }} launcher artifacts
         path: |
           equinox.binaries/org.eclipse.equinox.executable/bin/${{ matrix.config.ws }}/${{ matrix.config.os }}/{{ matrix.config.arch }}/**/eclipse*
           equinox.binaries/org.eclipse.equinox.launcher.${{ matrix.config.ws }}.${{ matrix.config.os }}.{{ matrix.config.arch }}/eclipse_*.${{ matrix.config.native-extension }}
         if-no-files-found: error
-    - name: Upload ${{ matrix.config.name }} Test Results
+    - name: Upload ${{ matrix.config.name }} {{ matrix.config.arch }} Test Results
       uses: actions/upload-artifact@v4
       with:
         name: test-results-${{ matrix.config.name }}{{ matrix.config.arch }}