cleanup after branch rebase

.github/workflows/apt.yml

@@ -39,7 +39,7 @@ on:
         required: false
 
 env:
-  ghcr: paulchen-panther # hyperion-project
+  ghcr: hyperion-project
 
 jobs:
   build:
@@ -105,7 +105,7 @@ jobs:
             -v "${GITHUB_WORKSPACE}:/source:rw" \
             ghcr.io/${{ env.ghcr }}/${{ matrix.os.distribution }}:${{ matrix.os.codename }} \
             /bin/bash -c "cd /source && \
-            mkdir -p debian/source && echo '${{ env.DEBIAN_FORMAT }}' > debian/source/format && \
+            mkdir -p debian/source && echo '${{ env.DEBIAN_FORMAT }}' > debian/source/format && echo 10 > debian/compat && \
             dch --create --distribution ${{ matrix.os.codename }} --package 'hyperion' -v '${{ env.VERSION }}~${{ matrix.os.codename }}' '${{ github.event.commits[0].message }}' && \
             cp -fr LICENSE debian/copyright && \
             sed 's/@ARCHITECTURE@/${{ matrix.architecture[0] }}/g; s/@STANDARDS_VERSION@/${{ env.STANDARDS_VERSION }}/g' debian/control.in > debian/control && \
@@ -121,7 +121,7 @@ jobs:
 
   publish:
     name: 🚀 Publish DEB packages
-    # if: ${{ github.repository == 'hyperion-project' && inputs.publish }}
+    if: ${{ github.repository == 'hyperion-project' && inputs.publish }}
     needs: [build]
     runs-on: ubuntu-latest
     steps:

.github/workflows/dnf.yml

@@ -39,7 +39,7 @@ on:
         required: false
 
 env:
-  ghcr: paulchen-panther # hyperion-project
+  ghcr: hyperion-project
 
 jobs:
   build:
@@ -56,7 +56,6 @@ jobs:
         ]
         architecture: [
           [ amd64, linux/amd64 ]
-          # [ arm64, linux/arm64 ] temporary disabled
         ]
 
     steps:
@@ -106,7 +105,7 @@ jobs:
 
   publish:
     name: 🚀 Publish RPM packages
-    # if: ${{ github.repository == 'hyperion-project' && inputs.publish }}
+    if: ${{ github.repository == 'hyperion-project' && inputs.publish }}
     needs: [build]
     runs-on: ubuntu-latest
     container:

.github/workflows/pull-request.yml

@@ -23,19 +23,15 @@ jobs:
         dockerImage: [ x86_64, armv6l, armv7l, aarch64 ]
         include:
           - dockerImage: x86_64
-            dockerName: Debian Buster (x86_64)
             dockerName: Debian Buster (x86_64)
             platform: x11
           - dockerImage: armv6l
-            dockerName: Debian Buster (Raspberry Pi v1 & ZERO)
             dockerName: Debian Buster (Raspberry Pi v1 & ZERO)
             platform: rpi
           - dockerImage: armv7l
-            dockerName: Debian Buster (Raspberry Pi 2 & 3)
             dockerName: Debian Buster (Raspberry Pi 2 & 3)
             platform: rpi
           - dockerImage: aarch64
-            dockerName: Debian Buster (Generic AARCH64)
             dockerName: Debian Buster (Generic AARCH64)
             platform: amlogic
 
@@ -44,7 +40,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          submodules: recursive
 
       - name: 🔧 Prepare
         shell: bash
@@ -58,7 +53,6 @@ jobs:
         env:
           DOCKER_IMAGE: ${{ matrix.dockerImage }}
           DOCKER_TAG: buster
-          DOCKER_TAG: buster
           DOCKER_NAME: ${{ matrix.dockerName }}
           PLATFORM: ${{ matrix.platform }}
         shell: bash
@@ -90,7 +84,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          submodules: recursive
 
       - name: 🔧 Prepare
         shell: bash
@@ -139,7 +132,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-          submodules: recursive
 
       - name: 🔧 Prepare
         shell: bash

.github/workflows/push.yml

@@ -8,176 +8,176 @@ on:
 
 jobs:
 
+##################
+##### Linux ######
+##################
+
+  Linux:
+    name: 🐧 ${{ matrix.dockerName }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dockerImage: [ x86_64, armv6l, armv7l, aarch64 ]
+        include:
+          - dockerImage: x86_64
+            dockerName: Debian Buster (x86_64)
+            platform: x11
+          - dockerImage: armv6l
+            dockerName: Debian Buster (Raspberry Pi v1 & ZERO)
+            platform: rpi
+          - dockerImage: armv7l
+            dockerName: Debian Buster (Raspberry Pi 2 & 3)
+            platform: rpi
+          - dockerImage: aarch64
+            dockerName: Debian Buster (Generic AARCH64)
+            platform: amlogic
+
+    steps:
+      - name: ⬇ Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: 👷 Build
+        env:
+          DOCKER_IMAGE: ${{ matrix.dockerImage }}
+          DOCKER_TAG: buster
+          DOCKER_NAME: ${{ matrix.dockerName }}
+          PLATFORM: ${{ matrix.platform }}
+        shell: bash
+        run: ./.ci/ci_build.sh
+
+      - name: 📦 Upload
+        if: startsWith(github.event.ref, 'refs/tags')
+        uses: actions/upload-artifact@v3
+        with:
+          path: deploy/Hyperion-*
+
 ###################
-###### Linux ######
+###### macOS ######
 ###################
 
-#   Linux:
+  macOS:
-#     name: 🐧 ${{ matrix.dockerName }}
+    name: 🍏 macOS
-#     runs-on: ubuntu-latest
+    runs-on: macos-latest
-#     strategy:
+    steps:
-#       matrix:
+      - name: ⬇ Checkout
-#         dockerImage: [ x86_64, armv6l, armv7l, aarch64 ]
+        uses: actions/checkout@v4
-#         include:
+        with:
-#           - dockerImage: x86_64
+          submodules: recursive
-#             dockerName: Debian Buster (x86_64)
-#             platform: x11
-#           - dockerImage: armv6l
-#             dockerName: Debian Buster (Raspberry Pi v1 & ZERO)
-#             platform: rpi
-#           - dockerImage: armv7l
-#             dockerName: Debian Buster (Raspberry Pi 2 & 3)
-#             platform: rpi
-#           - dockerImage: aarch64
-#             dockerName: Debian Buster (Generic AARCH64)
-#             platform: amlogic
 
-#     steps:
+      - name: 🔧 Prepare
-#       - name: ⬇ Checkout
+        shell: bash
-#         uses: actions/checkout@v4
+        run: |
-#         with:
+          echo '::group::Install dependencies'
-#           submodules: recursive
+            ./.ci/ci_install.sh
+          echo '::endgroup::'
 
-#       - name: 👷 Build
+      - name: 👷 Build
-#         env:
+        env:
-#           DOCKER_IMAGE: ${{ matrix.dockerImage }}
+          PLATFORM: osx
-#           DOCKER_TAG: buster
+        shell: bash
-#           DOCKER_NAME: ${{ matrix.dockerName }}
+        run: ./.ci/ci_build.sh
-#           PLATFORM: ${{ matrix.platform }}
-#         shell: bash
-#         run: ./.ci/ci_build.sh
 
-#       - name: 📦 Upload
+      - name: 📦 Upload
-#         if: startsWith(github.event.ref, 'refs/tags')
+        if: startsWith(github.event.ref, 'refs/tags')
-#         uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v3
-#         with:
+        with:
-#           path: deploy/Hyperion-*
+          path: build/Hyperion-*
 
-# ###################
+#####################
-# ###### macOS ######
+###### Windows ######
-# ###################
+#####################
 
-#   macOS:
+  windows:
-#     name: 🍏 macOS
+    name: 🪟 Windows
-#     runs-on: macos-latest
+    runs-on: windows-2022
-#     steps:
+    env:
-#       - name: ⬇ Checkout
+      VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
-#         uses: actions/checkout@v4
+      QT_VERSION: 5.15.2
-#         with:
+    steps:
-#           submodules: recursive
+      - name: ⬇ Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
-#       - name: 🔧 Prepare
+      - name: 💾 Cache/Restore
-#         shell: bash
+        uses: actions/cache@v3
-#         run: |
+        with:
-#           echo '::group::Install dependencies'
+          path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
-#             ./.ci/ci_install.sh
+          key: ${{ runner.os }}-chocolatey
-#           echo '::endgroup::'
 
-#       - name: 👷 Build
+      - name: 📥 Install OpenSSL, DirectX SDK, libjpeg-turbo
-#         env:
+        shell: powershell
-#           PLATFORM: osx
+        run: |
-#         shell: bash
+          choco install --no-progress openssl --version=1.1.1.2100 -y
-#         run: ./.ci/ci_build.sh
+          choco install --no-progress directx-sdk -y
+          Invoke-WebRequest https://netcologne.dl.sourceforge.net/project/libjpeg-turbo/2.0.6/libjpeg-turbo-2.0.6-vc64.exe -OutFile libjpeg-turbo.exe -UserAgent NativeHost
+          .\libjpeg-turbo /S
 
-#       - name: 📦 Upload
+      - name: 📥 Install Qt
-#         if: startsWith(github.event.ref, 'refs/tags')
+        uses: jurplel/install-qt-action@v3
-#         uses: actions/upload-artifact@v3
+        with:
-#         with:
+          version: ${{env.QT_VERSION}}
-#           path: build/Hyperion-*
+          target: 'desktop'
+          arch: 'win64_msvc2019_64'
+          cache: 'true'
+          cache-key-prefix: 'cache-qt-windows'
 
-# #####################
+      - name: 🛠️ Setup
-# ###### Windows ######
+        shell: cmd
-# #####################
+        run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
 
-#   windows:
+      - name: 👷 Build
-#     name: 🪟 Windows
+        env:
-#     runs-on: windows-2022
+          PLATFORM: windows
-#     env:
+        shell: bash
-#       VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
+        run: |
-#       QT_VERSION: 5.15.2
+          echo '::group::Build packages'
-#     steps:
+            ./.ci/ci_build.sh
-#       - name: ⬇ Checkout
+          echo '::endgroup::'
-#         uses: actions/checkout@v4
-#         with:
-#           submodules: recursive
 
-#       - name: 💾 Cache/Restore
+      - name: 📦 Upload
-#         uses: actions/cache@v3
+        if: startsWith(github.event.ref, 'refs/tags')
-#         with:
+        uses: actions/upload-artifact@v3
-#           path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
+        with:
-#           key: ${{ runner.os }}-chocolatey
+          path: build/Hyperion-*
+          retention-days: 1
 
-#       - name: 📥 Install OpenSSL, DirectX SDK, libjpeg-turbo
+#####################################
-#         shell: powershell
+###### Publish GitHub Releases ######
-#         run: |
+#####################################
-#           choco install --no-progress openssl --version=1.1.1.2100 -y
-#           choco install --no-progress directx-sdk -y
-#           Invoke-WebRequest https://netcologne.dl.sourceforge.net/project/libjpeg-turbo/2.0.6/libjpeg-turbo-2.0.6-vc64.exe -OutFile libjpeg-turbo.exe -UserAgent NativeHost
-#           .\libjpeg-turbo /S
 
-#       - name: 📥 Install Qt
+  github_publish:
-#         uses: jurplel/install-qt-action@v3
+    name: 🚀 Publish GitHub Releases
-#         with:
+    if: startsWith(github.event.ref, 'refs/tags')
-#           version: ${{env.QT_VERSION}}
+    needs: [Linux, macOS, windows]
-#           target: 'desktop'
+    runs-on: ubuntu-latest
-#           arch: 'win64_msvc2019_64'
+    steps:
-#           cache: 'true'
+      - name: ⬇ Checkout
-#           cache-key-prefix: 'cache-qt-windows'
+        uses: actions/checkout@v4
 
-#       - name: 🛠️ Setup
+      - name: 🔧 Prepare
-#         shell: cmd
+        run: |
-#         run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
+          echo '::group::Generate environment variables from .version and tag'
+            echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+            echo "VERSION=$(tr -d '\n' < .version)" >> $GITHUB_ENV
+          echo '::endgroup::'
 
-#       - name: 👷 Build
+      - name: 💾 Artifact download
-#         env:
+        uses: actions/download-artifact@v3.0.2
-#           PLATFORM: windows
+        with:
-#         shell: bash
+          path: artifacts
-#         run: |
-#           echo '::group::Build packages'
-#             ./.ci/ci_build.sh
-#           echo '::endgroup::'
 
-#       - name: 📦 Upload
+      - name: 📦 Upload
-#         if: startsWith(github.event.ref, 'refs/tags')
+        uses: softprops/action-gh-release@v1
-#         uses: actions/upload-artifact@v3
+        with:
-#         with:
+          name: Hyperion ${{ env.VERSION }}
-#           path: build/Hyperion-*
+          tag_name: ${{ env.TAG }}
-#           retention-days: 1
+          files: "artifacts/**"
-
+          draft: true
-# #####################################
+        env:
-# ###### Publish GitHub Releases ######
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-# #####################################
-
-#   github_publish:
-#     name: 🚀 Publish GitHub Releases
-#     if: startsWith(github.event.ref, 'refs/tags')
-#     needs: [Linux, macOS, windows]
-#     runs-on: ubuntu-latest
-#     steps:
-#      - name: ⬇ Checkout
-#         uses: actions/checkout@v4
-
-#       - name: 🔧 Prepare
-#         run: |
-#           echo '::group::Generate environment variables from .version and tag'
-#             echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
-#             echo "VERSION=$(tr -d '\n' < .version)" >> $GITHUB_ENV
-#           echo '::endgroup::'
-
-#       - name: 💾 Artifact download
-#         uses: actions/download-artifact@v3.0.2
-#         with:
-#           path: artifacts
-
-#       - name: 📦 Upload
-#         uses: softprops/action-gh-release@v1
-#         with:
-#           name: Hyperion ${{ env.VERSION }}
-#           tag_name: ${{ env.TAG }}
-#           files: "artifacts/**"
-#           draft: true
-#         env:
-#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 ###################################
 ###### APT reusable workflow ######
@@ -185,8 +185,8 @@ jobs:
 
   apt_build:
     name: APT Build
-    # if: startsWith(github.event.ref, 'refs/tags')
+    if: startsWith(github.event.ref, 'refs/tags')
-    # needs: [Linux, macOS, windows]
+    needs: [Linux, macOS, windows]
     uses: ./.github/workflows/apt.yml
     secrets: inherit
     with:
@@ -199,8 +199,8 @@ jobs:
 
   dnf_build:
     name: DNF Build
-    # if: startsWith(github.event.ref, 'refs/tags')
+    if: startsWith(github.event.ref, 'refs/tags')
-    # needs: [Linux, macOS, windows]
+    needs: [Linux, macOS, windows]
     uses: ./.github/workflows/dnf.yml
     secrets: inherit
     with:

.github/workflows/release.yml

@@ -18,31 +18,3 @@ jobs:
           repository: hyperion-project/HyperBian
           token: ${{ secrets.HYPERION_BOT_TOKEN }}
           event-type: hyperion_push
-
-
-  # TODO FOR APT/DNF:
-
-  # dnf_release:
-  #   name: Release DNF repository
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Create Backup and Release draft files on DNF repository
-  #       run: |
-  #         sudo apt-get install -y ncftp
-  #         mkdir backup draft_folder
-  #         ncftpget -R -T -V -u ${{ secrets.YUM_USER }} -p ${{ secrets.YUM_PASSWORD }} yum.hyperion-project.org ./backup/ ./
-  #         cd backup/ && mv ${{ secrets.DRAFT_FOLDER }}* ../draft_folder/ && rm -f backup.tar.gz
-  #         tar -zcf ../backup.tar.gz .
-  #         find -maxdepth 1 $(printf "! -name %s " ${{ secrets.EXCLUDED_FTP_FILES }})
-  #         find -maxdepth 1 $(printf "! -name %s " ${{ secrets.EXCLUDED_FTP_FILES }}) -exec rm -rf {} \;
-  #         mv ../draft_folder/* . && mv ../backup.tar.gz .
-
-  #     - name: Update DNF Package Repository (Release)
-  #       uses: SamKirkland/FTP-Deploy-Action@4.3.3
-  #       with:
-  #         server: yum.hyperion-project.org
-  #         username: ${{ secrets.YUM_USER }}
-  #         password: ${{ secrets.YUM_PASSWORD }}
-  #         local-dir: "./backup/"
-  #         server-dir: ./
-  #         dangerous-clean-slate: true

debian/compat

@@ -1 +0,0 @@
-10