cleanup after branch rebase

This commit is contained in:
Paulchen-Panther 2023-10-15 19:47:55 +02:00
parent b6c2e0cc0e
commit f117a769b5
6 changed files with 160 additions and 198 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -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:
# 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
macOS:
name: 🍏 macOS
runs-on: macos-latest
steps:
- name: ⬇ Checkout
uses: actions/checkout@v4
with:
submodules: recursive
# steps:
# - name: ⬇ Checkout
# uses: actions/checkout@v4
# with:
# submodules: recursive
- name: 🔧 Prepare
shell: bash
run: |
echo '::group::Install dependencies'
./.ci/ci_install.sh
echo '::endgroup::'
# - 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: 👷 Build
env:
PLATFORM: osx
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-*
- name: 📦 Upload
if: startsWith(github.event.ref, 'refs/tags')
uses: actions/upload-artifact@v3
with:
path: build/Hyperion-*
# ###################
# ###### macOS ######
# ###################
#####################
###### Windows ######
#####################
# macOS:
# name: 🍏 macOS
# runs-on: macos-latest
# steps:
# - name: ⬇ Checkout
# uses: actions/checkout@v4
# with:
# submodules: recursive
windows:
name: 🪟 Windows
runs-on: windows-2022
env:
VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
QT_VERSION: 5.15.2
steps:
- name: ⬇ Checkout
uses: actions/checkout@v4
with:
submodules: recursive
# - name: 🔧 Prepare
# shell: bash
# run: |
# echo '::group::Install dependencies'
# ./.ci/ci_install.sh
# echo '::endgroup::'
- name: 💾 Cache/Restore
uses: actions/cache@v3
with:
path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
key: ${{ runner.os }}-chocolatey
# - name: 👷 Build
# env:
# PLATFORM: osx
# shell: bash
# run: ./.ci/ci_build.sh
- name: 📥 Install OpenSSL, DirectX SDK, libjpeg-turbo
shell: powershell
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: 📦 Upload
# if: startsWith(github.event.ref, 'refs/tags')
# uses: actions/upload-artifact@v3
# with:
# path: build/Hyperion-*
- name: 📥 Install Qt
uses: jurplel/install-qt-action@v3
with:
version: ${{env.QT_VERSION}}
target: 'desktop'
arch: 'win64_msvc2019_64'
cache: 'true'
cache-key-prefix: 'cache-qt-windows'
# #####################
# ###### Windows ######
# #####################
- name: 🛠️ Setup
shell: cmd
run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
# windows:
# name: 🪟 Windows
# runs-on: windows-2022
# env:
# VCINSTALLDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
# QT_VERSION: 5.15.2
# steps:
# - name: ⬇ Checkout
# uses: actions/checkout@v4
# with:
# submodules: recursive
- name: 👷 Build
env:
PLATFORM: windows
shell: bash
run: |
echo '::group::Build packages'
./.ci/ci_build.sh
echo '::endgroup::'
# - name: 💾 Cache/Restore
# uses: actions/cache@v3
# with:
# path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
# key: ${{ runner.os }}-chocolatey
- name: 📦 Upload
if: startsWith(github.event.ref, 'refs/tags')
uses: actions/upload-artifact@v3
with:
path: build/Hyperion-*
retention-days: 1
# - name: 📥 Install OpenSSL, DirectX SDK, libjpeg-turbo
# shell: powershell
# 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
#####################################
###### Publish GitHub Releases ######
#####################################
# - name: 📥 Install Qt
# uses: jurplel/install-qt-action@v3
# with:
# version: ${{env.QT_VERSION}}
# target: 'desktop'
# arch: 'win64_msvc2019_64'
# cache: 'true'
# cache-key-prefix: 'cache-qt-windows'
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: 🛠️ Setup
# shell: cmd
# run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
- 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: 👷 Build
# env:
# PLATFORM: windows
# shell: bash
# run: |
# echo '::group::Build packages'
# ./.ci/ci_build.sh
# echo '::endgroup::'
- name: 💾 Artifact download
uses: actions/download-artifact@v3.0.2
with:
path: artifacts
# - name: 📦 Upload
# if: startsWith(github.event.ref, 'refs/tags')
# uses: actions/upload-artifact@v3
# with:
# path: build/Hyperion-*
# retention-days: 1
# #####################################
# ###### Publish GitHub Releases ######
# #####################################
# 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 }}
- 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')
# needs: [Linux, macOS, windows]
if: startsWith(github.event.ref, 'refs/tags')
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')
# needs: [Linux, macOS, windows]
if: startsWith(github.event.ref, 'refs/tags')
needs: [Linux, macOS, windows]
uses: ./.github/workflows/dnf.yml
secrets: inherit
with:

View File

@ -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

1
debian/compat vendored
View File

@ -1 +0,0 @@
10