From 92483ec07e8dcb6c94c9c253b9b64d24ec06f2b9 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 6 Nov 2023 15:06:15 +0100 Subject: [PATCH] Add inputs.build_options for DEB_BUILD_OPTIONS. --- .github/workflows/build_pkg.yml | 7 +++++++ container/bin/build_source | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml index 91b14db..41af96f 100644 --- a/.github/workflows/build_pkg.yml +++ b/.github/workflows/build_pkg.yml @@ -29,12 +29,17 @@ on: decsription: changelog entry default: "Rebuild for Garden Linux." required: true + build_options: + description: Options to be passed to DEB_BUILD_OPTIONS variable + required: false + env: INPUT_EMAIL: ${{ inputs.email }} INPUT_NAME: ${{ inputs.name }} INPUT_DIST: ${{ inputs.distribution }} INPUT_MESSAGE: ${{ inputs.message }} + INPUT_BUILD_OPTIONS: ${{ inputs.build_options }} jobs: source: @@ -75,6 +80,7 @@ jobs: -e NAME=${{ env.INPUT_NAME }} \ -e DIST=${{ env.INPUT_DIST }} \ -e MESSAGE=${{ env.INPUT_MESSAGE }} \ + -e BUILD_OPTIONS=${{ env.INPUT_BUILD_OPTIONS }} \ --rm \ -v "$PWD/input:/input" \ -v "$PWD/output:/output" \ @@ -153,6 +159,7 @@ jobs: -e NAME=${{ env.INPUT_NAME }} \ -e DIST=${{ env.INPUT_DIST }} \ -e MESSAGE=${{ env.INPUT_MESSAGE }} \ + -e BUILD_OPTIONS=${{ env.INPUT_BUILD_OPTIONS }} \ --rm \ -v "$PWD/input:/input" \ -v "$PWD/output:/output" \ diff --git a/container/bin/build_source b/container/bin/build_source index 253e5c0..a7d0ef1 100755 --- a/container/bin/build_source +++ b/container/bin/build_source @@ -6,7 +6,7 @@ exec 3>&1 exec 1>&2 main() ( - DEB_BUILD_OPTIONS="terse $(yq -r '.build_options // ""' < "/input/pkg.yaml")" + DEB_BUILD_OPTIONS="$BUILD_OPTIONS" export DEB_BUILD_OPTIONS source="$(yq -r '.source // ""' < "/input/pkg.yaml")"