From d27ead61b371a5eca632011d1340269054da2284 Mon Sep 17 00:00:00 2001 From: miro Date: Wed, 27 Nov 2024 15:38:25 +0000 Subject: [PATCH] remove duplicate step --- .github/workflows/build_base.yml | 7 ++++--- .github/workflows/build_img.yml | 1 + .github/workflows/build_img_ca.yml | 1 + .github/workflows/build_img_gui.yml | 7 ++++--- build_base.sh | 1 - setup_kernel_modules.sh | 29 ----------------------------- 6 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 setup_kernel_modules.sh diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml index d1c1e821..2f761a8b 100644 --- a/.github/workflows/build_base.yml +++ b/.github/workflows/build_base.yml @@ -1,6 +1,7 @@ name: build base no-OVOS headless image on: + push: workflow_dispatch: jobs: @@ -44,7 +45,7 @@ jobs: release_name: raspOVOS-NO-OVOS-bookworm-arm64-lite-${{ github.run_id }} body: | testing base OS setup only - draft: true + draft: false prerelease: false - name: Upload to releases @@ -54,7 +55,7 @@ jobs: with: file: ${{ steps.create-image.outputs.image-path }} release_id: ${{ steps.create_release.outputs.id }} - draft: true + draft: false overwrite: true - prerelease: true + prerelease: false verbose: true diff --git a/.github/workflows/build_img.yml b/.github/workflows/build_img.yml index 5596a287..24777cb1 100644 --- a/.github/workflows/build_img.yml +++ b/.github/workflows/build_img.yml @@ -1,6 +1,7 @@ name: build headless image on: + push: workflow_dispatch: jobs: diff --git a/.github/workflows/build_img_ca.yml b/.github/workflows/build_img_ca.yml index e8609623..548b5b9e 100644 --- a/.github/workflows/build_img_ca.yml +++ b/.github/workflows/build_img_ca.yml @@ -1,6 +1,7 @@ name: build catalan headless image on: + push: workflow_dispatch: jobs: diff --git a/.github/workflows/build_img_gui.yml b/.github/workflows/build_img_gui.yml index a6d9b784..914694b1 100644 --- a/.github/workflows/build_img_gui.yml +++ b/.github/workflows/build_img_gui.yml @@ -1,6 +1,7 @@ name: build GUI image on: + push: workflow_dispatch: jobs: @@ -44,7 +45,7 @@ jobs: release_name: raspOVOS-GUI-bookworm-arm64-lite-${{ github.run_id }} body: | raspOVOS GUI image - draft: true + draft: false prerelease: false - name: Upload to releases @@ -54,7 +55,7 @@ jobs: with: file: ${{ steps.create-image.outputs.image-path }} release_id: ${{ steps.create_release.outputs.id }} - draft: true + draft: false overwrite: true - prerelease: true + prerelease: false verbose: true diff --git a/build_base.sh b/build_base.sh index 93b37eb0..4f2bc2c3 100644 --- a/build_base.sh +++ b/build_base.sh @@ -73,7 +73,6 @@ bash /mounted-github-repo/setup_wlan0power.sh bash /mounted-github-repo/setup_fstab.sh bash /mounted-github-repo/setup_sysctl.sh bash /mounted-github-repo/setup_udev.sh -bash /mounted-github-repo/setup_kernel_modules.sh bash /mounted-github-repo/setup_nmanager.sh # make boot faster by printing less stuff and skipping file system checks grep -q "quiet fastboot" /boot/cmdline.txt || sed -i 's/$/ quiet fastboot/' /boot/cmdline.txt diff --git a/setup_kernel_modules.sh b/setup_kernel_modules.sh deleted file mode 100644 index 772347c0..00000000 --- a/setup_kernel_modules.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# Exit on error -# If something goes wrong just stop. -# it allows the user to see issues at once rather than having -# scroll back and figure out what went wrong. -set -e - - -echo "Configuring I2C, SPI, and I2S kernel modules..." - -# Enable I2C, SPI, and I2S in /boot/config.txt -CONFIG_FILE="/boot/config.txt" - -declare -A dtparams=( - ["dtparam=i2c_arm"]="on" - ["dtparam=spi"]="on" - ["dtparam=i2s"]="on" -) - -for key in "${!dtparams[@]}"; do - value="${dtparams[$key]}" - if grep -q "^${key}=" "$CONFIG_FILE"; then - sed -i "s|^${key}=.*|${key}=${value}|" "$CONFIG_FILE" - else - echo "${key}=${value}" >> "$CONFIG_FILE" - fi -done - -echo "Kernel modules and Device Tree parameters configured."