diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml index 57c2f0d..57743ce 100644 --- a/.github/workflows/build_pkg.yml +++ b/.github/workflows/build_pkg.yml @@ -31,9 +31,6 @@ on: source_name: type: string default: "${{ github.workflow }}" - debian_source: - type: string - default: "" source_version: type: string version_suffix: @@ -47,7 +44,6 @@ env: INPUT_MESSAGE: ${{ inputs.message }} INPUT_BUILD_OPTIONS: ${{ inputs.build_options }} INPUT_SOURCE_NAME: ${{ inputs.source_name }} - INPUT_DEBIAN_SOURCE: ${{ inputs.debian_source }} INPUT_SOURCE_VERSION: ${{ inputs.source_version }} INPUT_VERSION_SUFFIX: ${{ inputs.version_suffix }} @@ -60,10 +56,12 @@ jobs: release: ${{ steps.release.outputs.release }} runs-on: ubuntu-latest steps: + - name: fetch workflow branch name + run: branch=$(`echo ${{ github.workflow_ref }} | cut -d"@" -f2`) - uses: actions/checkout@v4 with: repository: gardenlinux/package-build - ref: ${{ github.ref_name }} + ref: $(branch) - run: mkdir input output - uses: actions/checkout@v4 with: @@ -74,6 +72,10 @@ jobs: run: podman pull "${{ inputs.build_container }}:amd64" - name: fetch dependencies run: | + echo ${{ github.workflow_ref }} + echo ${GITHUB_REF} + echo ${GITHUB_REF#*/} + echo ${{ github.workflow_sha }} mkdir _pkgs while IFS=@ read -r repo tag; do ./scripts/gh_release "${{ github.token }}" "$repo" list "$tag" | grep '\.deb$' | while read -r url; do @@ -93,7 +95,6 @@ jobs: -e MESSAGE='${{ env.INPUT_MESSAGE }}' \ -e BUILD_OPTIONS='${{ env.INPUT_BUILD_OPTIONS }}' \ -e SOURCE_NAME='${{ env.INPUT_SOURCE_NAME }}' \ - -e DEBIAN_SOURCE='${{ env.INPUT_DEBIAN_SOURCE }}' \ -e SOURCE_VERSION='${{ env.INPUT_SOURCE_VERSION }}' \ -e VERSION_SUFFIX='${{ env.INPUT_VERSION_SUFFIX }}' \ --rm \ diff --git a/container/bin/build_source b/container/bin/build_source index e41bdf9..8960bc5 100755 --- a/container/bin/build_source +++ b/container/bin/build_source @@ -18,8 +18,10 @@ main() ( apt_source "$source" fi + find + # if debian_source defined: remove debian folder from source and replace with debian folder from debian_source - if [ -n "$debian_source" ]; then + if [ -d "$debian_source" ]; then mkdir debian_src cd debian_src if [[ "$debian_source" = "git+"* ]]; then