Fix workflow (#363)

* Fix workflow

* Update rauc.sh

* Update rootfs-layer.sh

* Delete .travis.yml
This commit is contained in:
Pascal Vizeli 2019-02-22 00:51:46 +01:00 committed by GitHub
parent 7308bad953
commit ba01ed951b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 48 deletions

35
.github/main.workflow vendored
View File

@ -3,43 +3,32 @@ workflow "Shellcheck" {
resolves = ["Buildroot Scripts", "Helper Scripts", "Board Scripts", "OS/sbin Scripts", "OS/libexec Scripts", "OS/rauc Scripts"] resolves = ["Buildroot Scripts", "Helper Scripts", "Board Scripts", "OS/sbin Scripts", "OS/libexec Scripts", "OS/rauc Scripts"]
} }
action "Init Shellcheck" {
uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108"
args = "pull koalaman/shellcheck"
}
action "Helper Scripts" { action "Helper Scripts" {
uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" uses = "actions/bin/shellcheck@master"
args = "run run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh" args = "scripts/*.sh"
needs = ["Init Shellcheck"]
} }
action "Buildroot Scripts" { action "Buildroot Scripts" {
uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" uses = "actions/bin/shellcheck@master"
args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh" args = "buildroot-external/scripts/*.sh"
needs = ["Init Shellcheck"]
} }
action "Board Scripts" { action "Board Scripts" {
uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" uses = "actions/bin/shellcheck@master"
args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh" args = "buildroot-external/board/**/*.sh"
needs = ["Init Shellcheck"]
} }
action "OS/sbin Scripts" { action "OS/sbin Scripts" {
uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" uses = "actions/bin/shellcheck@master"
args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*" args = "buildroot-external/rootfs-overlay/usr/sbin/*"
needs = ["Init Shellcheck"]
} }
action "OS/libexec Scripts" { action "OS/libexec Scripts" {
uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" uses = "actions/bin/shellcheck@master"
args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*" args = "buildroot-external/rootfs-overlay/usr/libexec/*"
needs = ["Init Shellcheck"]
} }
action "OS/rauc Scripts" { action "OS/rauc Scripts" {
uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" uses = "actions/bin/shellcheck@master"
args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*" args = "buildroot-external/rootfs-overlay/usr/lib/rauc/*"
needs = ["Init Shellcheck"]
} }

View File

@ -1,25 +0,0 @@
language: bash
sudo: required
service: docker
addons:
apt:
packages:
- docker-ce
before_install:
- shopt -s globstar
- docker pull koalaman/shellcheck
script:
- docker run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*
- docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*
matrix:
fast_finish: true

View File

@ -78,6 +78,7 @@ function install_rauc_certs() {
function install_bootloader_config() { function install_bootloader_config() {
if [ "${BOOTLOADER}" == "uboot" ]; then if [ "${BOOTLOADER}" == "uboot" ]; then
# shellcheck disable=SC1117
echo -e "/dev/disk/by-partlabel/hassos-bootstate\t0x0000\t${BOOT_ENV_SIZE}" > "${TARGET_DIR}/etc/fw_env.config" echo -e "/dev/disk/by-partlabel/hassos-bootstate\t0x0000\t${BOOT_ENV_SIZE}" > "${TARGET_DIR}/etc/fw_env.config"
else else
cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${TARGET_DIR}/etc/barebox-state.dtb" cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${TARGET_DIR}/etc/barebox-state.dtb"

View File

@ -29,6 +29,7 @@ function fix_rootfs() {
function install_hassos_cli() { function install_hassos_cli() {
# shellcheck disable=SC1117
sed -i "s|\(root.*\)/bin/sh|\1/usr/sbin/hassos-cli|" "${TARGET_DIR}/etc/passwd" sed -i "s|\(root.*\)/bin/sh|\1/usr/sbin/hassos-cli|" "${TARGET_DIR}/etc/passwd"
if ! grep "hassos-cli" "${TARGET_DIR}/etc/shells"; then if ! grep "hassos-cli" "${TARGET_DIR}/etc/shells"; then