Skip to content

Commit

Permalink
Merge branch 'armbian:main' into genio
Browse files Browse the repository at this point in the history
  • Loading branch information
HeyMeco authored Nov 5, 2024
2 parents f301648 + 48228f1 commit 5968adb
Show file tree
Hide file tree
Showing 69 changed files with 1,706 additions and 5,831 deletions.
6 changes: 4 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ config/boards/aml-s905d3-cc.wip @Tonymac32
config/boards/aml-s9xx-box.tvb @SteeManMI
config/boards/armsom-sige1.csc @amazingfate
config/boards/armsom-sige3.csc @amazingfate
config/boards/avaota-a1.conf @chainsx
config/boards/avaota-a1.csc @chainsx
config/boards/ayn-odin2.eos @FantasyGmm
config/boards/bananapi.conf @DylanHP @janprunk
config/boards/bananapicm4io.conf @pyavitz
Expand All @@ -35,6 +35,8 @@ config/boards/bananapim64.csc @devdotnetorg
config/boards/bananapim7.conf @amazingfate
config/boards/bigtreetech-cb1.conf @JohnTheCoolingFan
config/boards/cherryba-m1.csc @IsMrX
config/boards/clearfogpro.csc @Heisath
config/boards/cm3588-nas.csc @ColorfulRhino
config/boards/coolpi-cm5.csc @andyshrk
config/boards/firefly-itx-3588j.csc @SeeleVolleri
config/boards/fxblox-rk1.csc @mahdichi
Expand Down Expand Up @@ -70,7 +72,6 @@ config/boards/mekotronics-r58-minipc.csc @monkaBlyat
config/boards/mekotronics-r58x-4g.csc @monkaBlyat
config/boards/mekotronics-r58x.csc @monkaBlyat
config/boards/mixtile-blade3.csc @rpardini
config/boards/nanopc-cm3588-nas.csc @ColorfulRhino
config/boards/nanopct6-lts.conf @SuperKali @Tonymac32
config/boards/nanopct6.conf @SuperKali @Tonymac32
config/boards/nanopi-m6.conf @efectn
Expand All @@ -91,6 +92,7 @@ config/boards/odroidn2.conf @NicoD-SBC
config/boards/odroidxu4.conf @joekhoobyar
config/boards/olimex-teres-a64.conf @Kreyren
config/boards/onecloud.conf @hzyitc
config/boards/oneplus-kebab.conf @amazingfate
config/boards/orangepi4-lts.conf @paolosabatino
config/boards/orangepi4.csc @paolosabatino
config/boards/orangepi5-plus.conf @alexl83 @efectn
Expand Down
4 changes: 4 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
#
# Please keep the labels sorted and deduplicated.

"Needs review":
- changed-files:
- any-glob-to-any-file: '**'

"Hardware":
- all:
- changed-files:
Expand Down
128 changes: 128 additions & 0 deletions .github/workflows/adjust-maintainers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
name: "Sync maintainers status"

# Script connects to the contacts database once per hour and updates BOARD_MAINTAINER property in the board config files.
# If there are any changes, it opens a Pull Request
#
# spdx-id: GPL-2.0-or-later
# copyright-owner: @igorpecovnik

# Dependencies: lftp, jq

on:
schedule:
- cron: "0 * * * *"
workflow_dispatch:

jobs:

Build:
name: "Maintainers sync"
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'armbian' }}
steps:

- name: "Checkout build repo"
uses: actions/checkout@v4
with:
repository: armbian/build
ref: main
fetch-depth: 0
clean: false

- name: "Install SSH key for storage"
uses: shimataro/ssh-key-action@v2
with:
key: ${{ secrets.KEY_UPLOAD }}
known_hosts: ${{ secrets.KNOWN_HOSTS_ARMBIAN_UPLOAD }}
if_key_exists: replace

- name: "Install dependencies"
run: |
sudo apt-get -y -qq install jq
- name: "Download JSON file"
run: |
# download json that is prepared for this action in another cron job
rsync -e "ssh -p ${{ secrets.HOST_UPLOAD_PORT }}" -arvc ${{ secrets.HOST_UPLOAD_USER }}@${{ secrets.HOST_UPLOAD }}:/incoming/json/armbian_maintainers.json /tmp/
- name: "Update maintainers"
run: |
# reset all maintainers so we generate from scratch
sed -i "s/BOARD_MAINTAINER.*/BOARD_MAINTAINER=\"\"/" config/boards/*.{conf,wip,eos,tvb}
# extract values fron JSON
declare -A MAINTAINERS
{
# By default, bash run the pipe command in subshells
# which make variable can't be assigned to.
# And yes, lastpipe can solve it
# But this is better.
while read -r i; do
NAME="$(echo "$i" | jq --raw-output '.First_Name')"
BOARD="$(echo "$i" | jq --raw-output '.Maintaining')"
MAINTAINER_GITHUB="$(echo "$i" | jq --raw-output '.Github' | cut -d"/" -f4)"
if [[ "$BOARD" != null && "$MAINTAINER_GITHUB" != null ]]; then
echo "- [$NAME](https://github.com/${MAINTAINER_GITHUB})"
while read -r i; do
echo -e " - $i"
MAINTAINERS["$i"]+="$MAINTAINER_GITHUB "
done < <( echo "$BOARD" | sed "s/,/\n/g" | sort -u )
fi
done < <(jq -c '.[]' /tmp/armbian_maintainers.json)
for cfg in config/boards/*.{conf,wip,csc,eos,tvb}; do
board_name="$(echo "${cfg##*/}" | sed -E 's/\..*//')"
declare -a maintainers
readarray -t maintainers < <(echo "${MAINTAINERS[${board_name}]}" | xargs -n1 | sort -u)
sed -i "s/BOARD_MAINTAINER=.*/BOARD_MAINTAINER=\"${maintainers[*]}\"/" "${cfg}"
done
} >> "$GITHUB_STEP_SUMMARY"
- name: "Mark csc for no maintainer"
run: |
grep BOARD_MAINTAINER=\"\" config/boards/*.{wip,conf} | cut -d":" -f1 |
while read -r line; do
if [[ "${line}" != "${line/.conf/.csc}" ]]; then
mv -v "$line" "${line/.conf/.csc}"
fi
if [[ "${line}" != "${line/.wip/.csc}" ]]; then
mv -v "$line" "${line/.wip/.csc}"
fi
done
- name: "Re-generate CODEOWNERS"
run: |
./.github/generate_CODEOWNERS.sh
- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: '`Automatic` board configs status synchronise'
signoff: false
branch: update-maintainers
delete-branch: true
title: '`Automatic` board configs status synchronise'
body: |
Update maintainers and board status
- synced status from the database
- rename to .`csc` where we don't have anyone
If you want to become a board maintainer, [adjust data here](https://www.armbian.com/update-data/).
Ref:
- [Board Maintainers Procedures and Guidelines](https://docs.armbian.com/Board_Maintainers_Procedures_and_Guidelines/)
- [Contribute](https://docs.armbian.com/Process_Contribute/)
labels: |
Needs review
#assignees: igorpecovnik
#reviewers: Must be org collaborator
draft: false
22 changes: 0 additions & 22 deletions .github/workflows/build-train.yml

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/clean-workflow-logs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Clean Workflow Logs

on:
schedule:
- cron: "0 0 * * 1" # Runs "At 00:00 on Monday." (see https://crontab.guru)

workflow_dispatch:
inputs:
runs_older_than:
description: "The amount of days old to delete"
default: "21"
required: false

env:
SCHEDULED_RUNS_OLDER_THAN: "21"
SCHEDULED_RUNS_TO_KEEP: "0"

jobs:
clean-logs:
runs-on: ubuntu-latest
permissions:
actions: write
steps:
- uses: igorjs/gh-actions-clean-workflow@v6
with:
runs_older_than: ${{ github.event.inputs.runs_older_than || env.SCHEDULED_RUNS_OLDER_THAN }}
runs_to_keep: ${{ github.event.inputs.runs_to_keep || env.SCHEDULED_RUNS_TO_KEEP }}
24 changes: 24 additions & 0 deletions .github/workflows/issue-welcome-first-time.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: "Welcome first-time issue contributor"

on:
issues:
types: opened

jobs:
welcome-first-time-contributor:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: plbstl/first-contribution@v3
with:
labels: "Good first issue"
issue-opened-msg: |
### Hey @{fc-author} !
Looks like it's your first time interacting with Armbian here on GitHub.
Welcome and thank you for taking the time to report an issue :heart:.
Don't forget to star :star: the repo.
2 changes: 1 addition & 1 deletion .github/workflows/merge-announce.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: push
name: "Announce PR merge to Discord"

on:
push:
Expand Down
22 changes: 19 additions & 3 deletions .github/workflows/pr-auto-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,31 @@ run-name: 'Set labels - PR #${{ github.event.pull_request.number }} ("${{ github
# Set labels for pull requests automatically based on size (modified via job 'label-size') and file categories (modified via .github/labeler)
#

on:
- pull_request_target
on: pull_request_target

jobs:
label-remove:
permissions:
contents: read # for pascalgn/size-label-action to determine modified files
pull-requests: write # for pascalgn/size-label-action to add labels to PRs
name: "Remove Ready to merge"
if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
runs-on: ubuntu-latest

steps:
- uses: PauMAVA/add-remove-label-action@v1.0.3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
add: ""
remove: "Ready to merge"

label-category:
permissions:
contents: read # for actions/labeler to determine modified files
pull-requests: write # for actions/labeler to add labels to PRs

name: "Category labels"
if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
runs-on: ubuntu-latest

steps:
Expand All @@ -28,11 +43,12 @@ jobs:
pull-requests: write # for pascalgn/size-label-action to add labels to PRs

name: "Size label"
if: ${{ github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize' }}
runs-on: ubuntu-latest

steps:
- name: size-label
uses: "pascalgn/size-label-action@v0.5.4"
uses: "pascalgn/size-label-action@v0.5.5"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
with:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/pr-build-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@ run-name: "Generate artifacts - PR #${{ github.event.pull_request.number }} - by
# In the run name, ${{ github.actor }} shows who's privileges are used for this run.
#

on:
pull_request:
types: [opened, reopened, synchronize, labeled]
on: pull_request_target

jobs:
Check:
permissions:
pull-requests: read

name: Check label and authorization
if: contains(github.event.pull_request.labels.*.name, 'Build')
name: Check label and authorization
runs-on: Linux
outputs:
member: ${{ steps.checkUserMember.outputs.isTeamMember }}
steps:
- uses: tspascoal/get-user-teams-membership@v3
if: contains(github.event.pull_request.labels.*.name, 'Build')
id: checkUserMember
with:
username: ${{ github.actor }}
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/pr-label-on-approved.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
on: pull_request_review
name: Label approved pull requests
jobs:
labelWhenApproved:
if: ${{ github.repository_owner == 'armbian' }}
name: Label when approved
runs-on: ubuntu-latest
steps:
- name: Label when approved
uses: pullreminders/label-when-approved-action@master
env:
APPROVALS: "1"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ADD_LABEL: "Ready to merge"
REMOVE_LABEL: "Needs%20review"
23 changes: 23 additions & 0 deletions .github/workflows/pr-welcome-first-time.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: "Welcome first-time PR contributor"

on:
pull_request_target:
types: opened

jobs:
welcome-first-time-contributor:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: plbstl/first-contribution@v3
with:
pr-opened-msg: |
### Hey @{fc-author} !
Looks like it's your first pull reqests to Armbian codebase.
Welcome and thank you for contributing :heart: :heart: :heart:.
Don't forget to star :star: the repo.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Update board list at armbian/os
run-name: Update board list at armbian/os - Pushed commit "${{ github.event.push.head_commit.message }}"
name: Update Board Lists
run-name: Update board list at armbian/os

on:
push:
Expand Down
1 change: 0 additions & 1 deletion config/boards/armsom-cm5-io.csc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3576-armsom-cm5-io.dtb"
BOOT_SCENARIO="spl-blobs"
IMAGE_PARTITION_TABLE="gpt"
SRC_EXTLINUX="yes"
BOARD_MAINTAINER=""

function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
Expand Down
Loading

0 comments on commit 5968adb

Please sign in to comment.