From f8d8f020077cc5d08386609b58c95c0f6f9d23ff Mon Sep 17 00:00:00 2001 From: Patrick Rudolph <36034716+PatrickRudolph@users.noreply.github.com> Date: Mon, 3 Aug 2020 08:12:15 +0200 Subject: [PATCH] build/package: Move RPM, DEB files into regular golang hierachy folders (#144) Add build/package and place NFPM config files in there. Signed-off-by: Patrick Rudolph --- .circleci/config.yml | 4 ++-- {cmd/txt-suite => build/package}/nfpm_deb.yaml | 0 {cmd/txt-suite => build/package}/nfpm_rpm.yaml | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {cmd/txt-suite => build/package}/nfpm_deb.yaml (100%) rename {cmd/txt-suite => build/package}/nfpm_rpm.yaml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b332bd..cfd0713 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,8 +52,8 @@ jobs: - run: cp /tmp/out/txt-suite . - run: if [ -z "$CIRCLE_TAG" ]; then echo "export CIRCLE_TAG=$(git describe --tags|cut -d'-' -f1);" >> $BASH_ENV; fi - run: if [ -z "$CIRCLE_BUILD_NUM" ]; then echo "export CIRCLE_BUILD_NUM=$(git describe --tags|cut -d'-' -f2);" >> $BASH_ENV; fi - - run: MY_APP_VERSION=${CIRCLE_TAG} MY_APP_BUILDNUMBER=${CIRCLE_BUILD_NUM} go run github.com/goreleaser/nfpm/cmd/nfpm pkg --config ./cmd/txt-suite/nfpm_rpm.yaml --target golang-txt-suite-${CIRCLE_TAG}-${CIRCLE_BUILD_NUM}.x86_64.rpm - - run: MY_APP_VERSION=${CIRCLE_TAG} MY_APP_BUILDNUMBER=${CIRCLE_BUILD_NUM} go run github.com/goreleaser/nfpm/cmd/nfpm pkg --config ./cmd/txt-suite/nfpm_deb.yaml --target go_txt-suite-${CIRCLE_TAG}-${CIRCLE_BUILD_NUM}_amd64.deb + - run: MY_APP_VERSION=${CIRCLE_TAG} MY_APP_BUILDNUMBER=${CIRCLE_BUILD_NUM} go run github.com/goreleaser/nfpm/cmd/nfpm pkg --config ./build/package/nfpm_rpm.yaml --target golang-txt-suite-${CIRCLE_TAG}-${CIRCLE_BUILD_NUM}.x86_64.rpm + - run: MY_APP_VERSION=${CIRCLE_TAG} MY_APP_BUILDNUMBER=${CIRCLE_BUILD_NUM} go run github.com/goreleaser/nfpm/cmd/nfpm pkg --config ./build/package/nfpm_deb.yaml --target go_txt-suite-${CIRCLE_TAG}-${CIRCLE_BUILD_NUM}_amd64.deb - run: mkdir -p out && cp *.rpm ./out/ && cp *.deb ./out/ - run: cp txt-suite ./out/ - run: cp golang-txt-suite-${CIRCLE_TAG}-${CIRCLE_BUILD_NUM}.x86_64.rpm artifact.rpm diff --git a/cmd/txt-suite/nfpm_deb.yaml b/build/package/nfpm_deb.yaml similarity index 100% rename from cmd/txt-suite/nfpm_deb.yaml rename to build/package/nfpm_deb.yaml diff --git a/cmd/txt-suite/nfpm_rpm.yaml b/build/package/nfpm_rpm.yaml similarity index 100% rename from cmd/txt-suite/nfpm_rpm.yaml rename to build/package/nfpm_rpm.yaml