actions ok

Author: dimitre

.github/workflows/of.yml

@@ -274,37 +274,6 @@ jobs:
     env:
       TARGET: ${{matrix.cfg.target}}
     steps:
-<<<<<<< HEAD
-    - name: Remove Old lib-unwind
-      run: if [ "$TARGET" = "linux64" ]; then
-            sudo apt-get remove libunwind-14 -y;
-           fi
-    - name: Fix apt broken
-      run: sudo apt --fix-broken install
-    - name: Cache Packages
-      uses: awalsh128/cache-apt-pkgs-action@latest
-      with:
-        packages: aptitude aptitude-common libboost-iostreams1.83.0 libcwidget4 libsigc++-2.0-0v5 libxapian30 fonts-wine{a} libasound2-plugins{a} libcapi20-3t64{a} libosmesa6{a} libpcsclite1{a} libspeexdsp1{a} libwine{a} libxkbregistry0{a} libz-mingw-w64{a} wine{a} wine64 wget2 make libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++ libgl1-mesa-dev libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libpulse-dev libusb-1.0-0-dev libgtk2.0-dev libopencv-dev libassimp-dev librtaudio-dev gdb libglfw3-dev liburiparser-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-libav gstreamer1.0-pulseaudio gstreamer1.0-x gstreamer1.0-plugins-bad gstreamer1.0-alsa gstreamer1.0-plugins-base gstreamer1.0-plugins-good 
-        version: 1.0
-    - name: Determine Release
-      id: vars
-      shell: bash
-      run: |
-        if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-          echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
-        elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
-          echo "RELEASE=nightly" >> $GITHUB_ENV
-        elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
-          echo "RELEASE=latest" >> $GITHUB_ENV
-        else
-          echo "RELEASE=latest" >> $GITHUB_ENV
-        fi
-    - uses: actions/checkout@v4
-    - name: ccache
-      uses: hendrikmuhs/ccache-action@v1.2.14
-      with:
-        key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
-=======
       - name: Remove Old lib-unwind
         run: if [ "$TARGET" = "linux64" ]; then
           sudo apt-get remove libunwind-14 -y;
@@ -332,7 +301,6 @@ jobs:
         uses: hendrikmuhs/ccache-action@v1.2.14
         with:
           key: ${{ matrix.cfg.target }}-${{ matrix.cfg.libs }}
->>>>>>> master
 
       - name: Download libs
         run: ./scripts/linux/download_libs.sh -t $RELEASE -a ${{matrix.cfg.libs}}