Skip to content

Commit

Permalink
Revert "See if INPUT_* variables get set, ever ..."
Browse files Browse the repository at this point in the history
This reverts commit 1b48345a16527c9ad3b5ecbf47ccb242a5a966d4.
  • Loading branch information
jtdor committed Dec 7, 2021
1 parent be0f823 commit 06119a8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
on: push

jobs:
different-artifacts_dir:
different-artifacts-dir:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./
env:
DEB_BUILD_OPTIONS: noautodbgsym
with:
artifacts_dir: my_artifacts
buildpackage_opts: --build=binary --no-sign
source_dir: test
artifacts-dir: my_artifacts
buildpackage-opts: --build=binary --no-sign
source-dir: test
- run: |
dpkg --info my_artifacts/test_1_amd64.deb
dpkg --contents my_artifacts/test_1_amd64.deb | grep ./usr/bin/mybin
test -f my_artifacts/test_1_amd64.buildinfo
test -f my_artifacts/test_1_amd64.changes
different-docker_image:
different-docker-image:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: ./
env:
DEB_BUILD_OPTIONS: noautodbgsym
with:
buildpackage_opts: --build=binary --no-sign
docker_image: ubuntu:latest
source_dir: test
buildpackage-opts: --build=binary --no-sign
docker-image: ubuntu:latest
source-dir: test
- run: |
dpkg --info debian/artifacts/test_1_amd64.deb
dpkg --contents debian/artifacts/test_1_amd64.deb | grep ./usr/bin/mybin
Expand All @@ -41,8 +41,8 @@ jobs:
- uses: actions/checkout@v2
- uses: ./
with:
buildpackage_opts: --build=binary --no-sign
source_dir: test
buildpackage-opts: --build=binary --no-sign
source-dir: test
- run: |
dpkg --info debian/artifacts/test_1_amd64.deb
dpkg --info debian/artifacts/test-dbgsym_1_amd64.deb
Expand All @@ -59,8 +59,8 @@ jobs:
env:
DEB_BUILD_OPTIONS: noautodbgsym
with:
buildpackage_opts: --build=binary --no-sign
source_dir: test
buildpackage-opts: --build=binary --no-sign
source-dir: test
- run: |
dpkg --info debian/artifacts/test_1_amd64.deb
dpkg --contents debian/artifacts/test_1_amd64.deb | grep ./usr/bin/mybin
Expand Down
12 changes: 6 additions & 6 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ author: Jörn-Thorben Hinz
name: Build Debian packages
description: Build Debian packages with dpkg-buildpackage in a flexible environment.
inputs:
apt_opts:
apt-opts:
description: Options to be passed to apt-get
required: false
artifacts_dir:
artifacts-dir:
default: debian/artifacts
description: Directory path relative to $GITHUB_WORKSPACE to place the built packages in
required: false
buildpackage_opts:
buildpackage-opts:
description: Options to be passed to dpkg-buildpackage
required: false
docker_image:
docker-image:
default: debian:stable-slim
description: Name of a Docker image to build inside
required: false
extra_build_deps:
extra-build-deps:
description: Extra packages to be installed as build dependencies
required: false
source_dir:
source-dir:
default: ''
description: Path relative to $GITHUB_WORKSPACE that contains the package sources
required: false
Expand Down
4 changes: 2 additions & 2 deletions scripts/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ case "$(realpath --canonicalize-missing -- "$INPUT_ARTIFACTS_DIR")" in
/github/workspace*)
;;
*)
bdp_error "artifacts_dir is not in GITHUB_WORKSPACE"
bdp_error "artifacts-dir is not in GITHUB_WORKSPACE"
exit 2
;;
esac
Expand All @@ -46,7 +46,7 @@ case "$(realpath --canonicalize-missing -- "$INPUT_SOURCE_DIR")" in
/github/workspace*)
;;
*)
bdp_error "source_dir is not in GITHUB_WORKSPACE"
bdp_error "source-dir is not in GITHUB_WORKSPACE"
exit 2
;;
esac
Expand Down

0 comments on commit 06119a8

Please sign in to comment.