updatessss

Author: Frank1o3

.github/workflows/ci.yml

@@ -2,153 +2,158 @@ name: Build
 
 on:
   pull_request:
-    branches: [main, master]
+    branches:
+      - main
+      - master
+
   workflow_dispatch:
     inputs:
-      skip_windows:
-        description: 'Skip building Windows binary'
-        required: false
-        default: false
+      build_linux:
+        description: Build Linux
+        type: boolean
+        default: true
+
+      build_windows:
+        description: Build Windows
         type: boolean
+        default: true
+
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
+
   build-linux:
+    if: github.event_name != 'workflow_dispatch' || inputs.build_linux
+
     runs-on: ubuntu-22.04
+
     permissions:
       contents: write
 
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v6
+
+      - name: Cache AppImage builder
+        uses: actions/cache@v5
+        with:
+          path: ~/.cache/appimage-builder
+          key: appimage-${{ hashFiles('AppImageBuilder.yml') }}
 
       - name: Install dependencies
         run: |
-          sudo apt-get update -y
+          sudo apt-get update
+
           sudo apt-get install -y \
-            cmake ninja-build \
+            ninja-build \
+            cmake \
             libopencv-dev \
-            libx11-dev libxext-dev
+            libx11-dev \
+            libxext-dev
 
-      - name: Make glue.sh executable
+      - name: Make glue executable
         run: chmod +x glue.sh
 
-      - name: Configure and build using glue.sh
+      - name: Build
         run: |
           ./glue.sh build \
             -t Release \
             -j $(nproc) \
-            -D CMAKE_GENERATOR=Ninja \
-            -D CMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong" \
-            -D CMAKE_EXE_LINKER_FLAGS="-Wl,-z,relro,-z,now"
+            -D CMAKE_GENERATOR=Ninja
 
       - name: Build AppImage
+        if: github.event_name != 'pull_request'
         uses: AppImageCrafters/build-appimage-action@master
         with:
           recipe: AppImageBuilder.yml
         env:
           UPDATE_INFO: gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*x86_64.AppImage.zsync
 
-      - name: Upload build artifact
-        uses: actions/upload-artifact@v7.0.1
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
         with:
           name: aimbot-linux-x86_64
-          path: aimbot-*.AppImage
+          path: |
+            aimbot-*.AppImage
+            build/aimbot
 
-      - name: Attach to release
+      - name: Attach release
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v3.0.0
+        uses: softprops/action-gh-release@v3
         with:
           files: aimbot-*.AppImage
 
-      - name: Trigger CoreOS-repo package build
+      - name: Trigger CoreOS package build
         if: startsWith(github.ref, 'refs/tags/')
         env:
           TAG: ${{ github.ref_name }}
         run: |
           VERSION="${TAG#v}"
+
           curl -s -X POST \
             -H "Accept: application/vnd.github.v3+json" \
             -H "Authorization: Bearer ${{ secrets.COREOS_REPO_TOKEN }}" \
             https://api.github.com/repos/Frank1o3/CoreOS-repo/dispatches \
             -d "{\"event_type\":\"aimbot-release\",\"client_payload\":{\"package\":\"aimbot\",\"version\":\"${VERSION}\"}}"
 
   build-windows:
-    # Run only if:
-    # - It's a pull_request (always), OR
-    # - It's a workflow_dispatch and the skip_windows checkbox is NOT checked
-    if: github.event_name != 'workflow_dispatch' || !github.event.inputs.skip_windows
+    if: github.event_name != 'workflow_dispatch' || inputs.build_windows
+
     runs-on: windows-latest
+
     permissions:
       contents: write
 
     env:
       VCPKG_DEFAULT_TRIPLET: x64-windows-static
-      VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}\.vcpkg-cache
-      FETCHCONTENT_BASE_DIR: ${{ github.workspace }}\.fetchcontent-cache
 
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v6
 
-      - name: Create cache dirs
-        run: |
-          New-Item -ItemType Directory -Force -Path "$env:VCPKG_DEFAULT_BINARY_CACHE"
-          New-Item -ItemType Directory -Force -Path "$env:FETCHCONTENT_BASE_DIR"
-
-      - name: Cache vcpkg binaries
-        uses: actions/cache@v5.0.5
-        with:
-          path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
-          key: vcpkg-opencv-core-imgproc-highgui-x64-static-v1
-          restore-keys: vcpkg-opencv-core-imgproc-highgui-x64-static-
+      - name: Setup Ninja
+        uses: seanmiddleditch/gha-setup-ninja@v6
 
-      - name: Cache vcpkg installed
-        id: vcpkg-installed
-        uses: actions/cache@v5.0.5
+      - name: Cache vcpkg
+        uses: actions/cache@v5
         with:
-          path: ${{ env.VCPKG_INSTALLATION_ROOT }}\installed
-          key: vcpkg-installed-opencv-core-imgproc-highgui-x64-static-v1
-          restore-keys: vcpkg-installed-opencv-core-imgproc-highgui-x64-static-
-
-      - name: Install OpenCV via vcpkg
-        if: steps.vcpkg-installed.outputs.cache-hit != 'true'
-        run: vcpkg install "opencv:x64-windows-static"
+          path: |
+            ${{ env.VCPKG_INSTALLATION_ROOT }}\downloads
+            ${{ env.VCPKG_INSTALLATION_ROOT }}\installed
+          key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
 
       - name: Cache FetchContent
-        uses: actions/cache@v5.0.5
-        with:
-          path: ${{ env.FETCHCONTENT_BASE_DIR }}
-          key: fetchcontent-${{ hashFiles('**/CMakeLists.txt') }}
-          restore-keys: fetchcontent-
-
-      - name: Cache build directory
-        uses: actions/cache@v5.0.5
+        uses: actions/cache@v5
         with:
-          path: build/windows
-          key: build-windows-${{ hashFiles('src/**', 'includes/**', 'CMakeLists.txt') }}
-          restore-keys: build-windows-
+          path: |
+            build/_deps
+          key: fetchcontent-${{ hashFiles('CMakeLists.txt') }}
 
       - name: Configure
         run: |
-          cmake -S . -B build/windows `
+          cmake -S . -B build `
+            -G Ninja `
             -DCMAKE_BUILD_TYPE=Release `
             -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" `
             -DVCPKG_TARGET_TRIPLET=x64-windows-static `
-            -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
-            -DFETCHCONTENT_BASE_DIR="${{ env.FETCHCONTENT_BASE_DIR }}"
+            -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
 
       - name: Build
-        run: cmake --build build/windows --config Release --parallel
+        run: |
+          cmake --build build --parallel
 
-      - name: Rename artifact
-        run: Copy-Item build/windows/Release/aimbot.exe aimbot-windows-x86_64.exe
+      - name: Rename executable
+        run: |
+          Copy-Item build/aimbot.exe aimbot-windows-x86_64.exe
 
-      - name: Upload build artifact
-        uses: actions/upload-artifact@v7.0.1
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
         with:
           name: aimbot-windows-x86_64
           path: aimbot-windows-x86_64.exe
 
-      - name: Attach to release
+      - name: Attach release
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v3.0.0
+        uses: softprops/action-gh-release@v3
         with:
           files: aimbot-windows-x86_64.exe

AppImageBuilder.yml

@@ -1,54 +1,33 @@
 version: 1
 
-script:
-  - rm -rf AppDir | true
-  - mkdir -p AppDir/usr/bin
-  - cp build/aimbot AppDir/usr/bin/
-  - mkdir -p AppDir/usr/share/icons/hicolor/256x256/apps
-  - cp aimbot.png AppDir/usr/share/icons/hicolor/256x256/apps/aimbot.png
-  - mkdir -p AppDir/usr/share/pixmaps
-  - cp aimbot.png AppDir/usr/share/pixmaps/aimbot.png
-  - mkdir -p AppDir/usr/share/icons
-  - cp aimbot.png AppDir/usr/share/icons/aimbot.png
-  - mkdir -p AppDir/usr/share/applications
-  - cp aimbot.desktop AppDir/usr/share/applications/
-
 AppDir:
-  path: ./AppDir
+  path: AppDir
+
   app_info:
-    id: aimbot
+    id: com.frank1o3.aimbot
     name: aimbot
     icon: aimbot
     version: latest
     exec: usr/bin/aimbot
-    exec_args: "$@"
+
+  files:
+    include:
+      - build/aimbot
+      - assets/aimbot.desktop
+      - assets/aimbot.png
 
   apt:
-    arch:
-      - amd64
+    arch: amd64
+
     sources:
-      - sourceline: 'deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse'
-        key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C'
+      - sourceline: "deb http://archive.ubuntu.com/ubuntu jammy main universe"
+
     include:
       - libopencv-core4.5d
       - libopencv-imgproc4.5d
-      - libopencv-imgcodecs4.5d
       - libopencv-highgui4.5d
       - libx11-6
       - libxext6
-      - libstdc++6
-      - libgcc-s1
-      - libc6
 
-  files:
-    include:
-      - /usr/lib/x86_64-linux-gnu/libopencv_core.so.4.5.4
-      - /usr/lib/x86_64-linux-gnu/libopencv_imgproc.so.4.5.4
-      - /usr/lib/x86_64-linux-gnu/libopencv_imgcodecs.so.4.5.4
-      - /usr/lib/x86_64-linux-gnu/libopencv_highgui.so.4.5.4
-      - /usr/lib/x86_64-linux-gnu/libxcb.so.1
-      - /usr/lib/x86_64-linux-gnu/libX11.so.6
-      - /usr/lib/x86_64-linux-gnu/libXext.so.6
-    exclude:
-      - usr/share
-      - usr/lib/debug
+AppImage:
+  arch: x86_64

CMakeLists.txt

@@ -15,7 +15,7 @@ if(MSVC)
   set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG")
   set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 else()
-  set(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -DNDEBUG")
+  set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
 endif()
 
 # ── Dependencies ──────────────────────────────────────────────────────────────
@@ -48,14 +48,14 @@ else()
         if(PYTHON_CV2_RESULT EQUAL 0 AND EXISTS "${PYTHON_CV2_PATH}")
             message(STATUS "Using OpenCV from Python installation: ${PYTHON_CV2_PATH}")
             set(OpenCV_INCLUDE_DIRS "${PYTHON_CV2_PATH}/include")
-            find_library(OpenCV_LIB_PYTHON cv2.abi3 
-                PATHS "${PYTHON_CV2_PATH}" 
+            find_library(OpenCV_LIB_PYTHON cv2.abi3
+                PATHS "${PYTHON_CV2_PATH}"
                 NO_DEFAULT_PATH)
             if(OpenCV_LIB_PYTHON)
                 set(OpenCV_LIBRARIES ${OpenCV_LIB_PYTHON})
             endif()
         endif()
-        
+
         if(NOT OpenCV_FOUND AND NOT OpenCV_LIBRARIES)
             message(STATUS "OpenCV not found, will attempt to link dynamically...")
         endif()

aimbot.desktop assets/aimbot.desktopaimbot.desktop renamed to assets/aimbot.desktop

@@ -0,0 +1,15 @@
+{
+  "name": "aimbot",
+  "version-string": "1.0.0",
+  "dependencies": [
+    {
+      "name": "opencv",
+      "default-features": false,
+      "features": [
+        "core",
+        "imgproc",
+        "highgui"
+      ]
+    }
+  ]
+}