CI: Update craft target names

Author: TheOneRing

.craft.ini

@@ -66,12 +66,12 @@ General/ABI = windows-cl-msvc2022-x86_64
 General/ABI = windows-cl-msvc2022-x86_64
 Compile/BuildType = Debug
 
-[macos-64-clang]
-General/ABI = macos-64-clang
+[macos-clang-x86]
+General/ABI = macos-clang-x86
 # Packager/PackageType = MacPkgPackager
 
-[macos-64-clang-debug]
-General/ABI = macos-64-clang
+[macos-clang-x86-debug]
+General/ABI = macos-clang-x86
 Compile/BuildType = Debug
 
 [macos-clang-arm64]
@@ -81,14 +81,14 @@ General/ABI = macos-clang-arm64
 General/ABI = macos-clang-arm64
 Compile/BuildType = Debug
 
-[linux-64-gcc]
-General/ABI = linux-64-gcc
+[linux-gcc-x86_64]
+General/ABI = linux-gcc-x86_64
 
-[linux-64-gcc-BlueprintSettings]
+[linux-gcc-x86_64-BlueprintSettings]
 libs/qt6/qtbase.withDBus = True
 
-[linux-64-gcc-debug]
-General/ABI = linux-64-gcc
+[linux-gcc-x86_64-debug]
+General/ABI = linux-gcc-x86_64
 Compile/BuildType = Debug
 
 [linux-64-gcc-debug-BlueprintSettings]

.github/workflows/main.yml

@@ -28,21 +28,17 @@ jobs:
         fail-fast: true
         matrix:
             include:
-            - name: windows-cl-x86_64
-              target: windows-cl-msvc2022-x86_64
+            - target: windows-cl-msvc2022-x86_64
               os: windows-latest
               container:
-            # TODO: align the target with the name
-            - name: macos-clang-arm64
-              target: macos-clang-arm64
+            - target: macos-clang-arm64
               os: macos-latest
               container:
-            - name: linux-gcc-x86_64
-              target: linux-64-gcc
+            - target: linux-gcc-x86_64
               os: ubuntu-latest
               container: ghcr.io/opencloud-eu/ci-docker-desktop/appimage:latest
 
-    name: ${{ matrix.name }}
+    name: ${{ matrix.target }}
 
     runs-on: ${{ matrix.os }}
 
@@ -55,13 +51,13 @@ jobs:
 
     steps:
     - name: Check out full source code for tooling
-      if: ${{ matrix.name  == 'linux-gcc-x86_64' }}
+      if: ${{ matrix.target  == 'linux-gcc-x86_64' }}
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Check out latest commit
-      if: ${{ matrix.name  != 'linux-gcc-x86_64' }}
+      if: ${{ matrix.target  != 'linux-gcc-x86_64' }}
       uses: actions/checkout@v4
 
     - name: Restore and update cache
@@ -124,7 +120,7 @@ jobs:
           & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --install-deps opencloud/opencloud-desktop
 
     - name: QML format lint
-      if: matrix.name  == 'linux-gcc-x86_64'
+      if: matrix.target  == 'linux-gcc-x86_64'
       run: |
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c libs/qt6/qttools
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run pwsh -c "git ls-files *.qml | %{ qmlformat -i `$_}"
@@ -135,7 +131,7 @@ jobs:
         }
 
     - name: clang-format format lint
-      if: matrix.name  == 'linux-gcc-x86_64'
+      if: matrix.target  == 'linux-gcc-x86_64'
       run: |
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c libs/llvm
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run git clang-format --force  ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
@@ -170,7 +166,7 @@ jobs:
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run python3 -m clang_html "$([System.IO.Path]::GetTempPath())/clang-tidy.log" -o "${env:GITHUB_WORKSPACE}/binaries/clang-tidy.html"
 
     - name: Package
-      if: matrix.name  != 'macos-clang-arm64'
+      if: matrix.target  != 'macos-clang-arm64'
       run: |
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --package opencloud/opencloud-desktop
 
@@ -188,12 +184,12 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.name }}-${{ github.run_number }}
+        name: ${{ matrix.target }}-${{ github.run_number }}
         path: ${{ github.workspace }}/binaries/*
 
     - name: Upload appx
       if: ${{ matrix.os  == 'windows-latest' && github.event_name != 'pull_request' }}
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ matrix.name }}-appx-${{ github.run_number }}
+        name: ${{ matrix.target }}-appx-${{ github.run_number }}
         path: ${{ github.workspace }}/appx/*