diff --git a/.circleci/config.yml b/.circleci/config.yml index c7411a35..56a7faf6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,8 @@ version: 2.1 +parameters: + package-version: + type: string + default: "1.0" jobs: shellcheck: @@ -31,7 +35,7 @@ jobs: name: Update changelog command: | rm ./debian/changelog - dch --create --distribution bullseye --package "pengwin-setup" --newversion 0.1-${CIRCLE_BUILD_NUM} "Built on Circle CI" + dch --create --distribution bullseye --package "pengwin-setup" --newversion << pipeline.parameters.package-version >>-${CIRCLE_BUILD_NUM} "Built on Circle CI" - run: name: Build the package command: debuild -i -us -uc -b @@ -40,7 +44,7 @@ jobs: command: mkdir -p /tmp/pkgs - run: name: Copy package to workspace - command: cp ../pengwin-setup_0.1-${CIRCLE_BUILD_NUM}_all.deb /tmp/pkgs + command: cp ../pengwin-setup_<< pipeline.parameters.package-version >>-${CIRCLE_BUILD_NUM}_all.deb /tmp/pkgs - persist_to_workspace: root: /tmp/pkgs paths: [ . ] @@ -96,7 +100,7 @@ jobs: command: gem install package_cloud - run: name: Push deb package bullseye - command: package_cloud push whitewaterfoundry/pengwin-setup/debian/bullseye /tmp/pkgs/pengwin-setup_0.1-*_all.deb + command: package_cloud push whitewaterfoundry/pengwin-setup/debian/bullseye /tmp/pkgs/pengwin-setup_<< pipeline.parameters.package-version >>-*_all.deb deploydevdeb: docker: - image: circleci/ruby:2.3-jessie @@ -109,7 +113,7 @@ jobs: command: gem install package_cloud - run: name: Push deb package bullseye - command: package_cloud push whitewaterfoundry/pengwin-setup-dev/debian/bullseye /tmp/pkgs/pengwin-setup_0.1-*_all.deb + command: package_cloud push whitewaterfoundry/pengwin-setup-dev/debian/bullseye /tmp/pkgs/pengwin-setup_<< pipeline.parameters.package-version >>-*_all.deb workflows: version: 2 testdebbuild: diff --git a/debian/copyright b/debian/copyright index b02d351c..24a3fb19 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,14 +3,14 @@ Upstream-Name: pengwin-setup Source: https://github.com/WhitewaterFoundry/pengwin-setup Files: * -Copyright: 2019 Whitewater Foundry, Ltd. Co. -License: Expat +Copyright: 2022 Whitewater Foundry, Ltd. Co. +License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: + furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -22,4 +22,3 @@ License: Expat LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - \ No newline at end of file