Simplify CircleCI deployment and display debug output

This commit is contained in:
Micah Lee 2021-11-30 15:56:32 -08:00
parent 57f7ed26f8
commit 8f22c4d680
No known key found for this signature in database
GPG key ID: 403C2657CD994F73

View file

@ -17,15 +17,13 @@ aliases:
name: Build the .deb package name: Build the .deb package
command: | command: |
./install/linux/build-deb.py ./install/linux/build-deb.py
dpkg -i deb_dist/dangerzone_*-1_all.deb ls -lh deb_dist/
ls -lh deb_dist/dangerzone_*-1_all.deb
- &build-rpm - &build-rpm
name: Build the .rpm package name: Build the .rpm package
command: | command: |
./install/linux/build-rpm.py ./install/linux/build-rpm.py
dnf install -y dist/dangerzone-*-1.noarch.rpm ls -lh dist/
ls -lh dist/dangerzone-*-1.noarch.rpm
- &restore-cache - &restore-cache
key: v1-{{ checksum "container/Dockerfile" }}-{{ checksum "container/dangerzone.py" }} key: v1-{{ checksum "container/Dockerfile" }}-{{ checksum "container/dangerzone.py" }}
@ -43,6 +41,9 @@ aliases:
name: Deploy to packagecloud.io name: Deploy to packagecloud.io
command: | command: |
VERSION=$(cat share/version.txt) VERSION=$(cat share/version.txt)
echo "PACKAGE_TYPE is ${PACKAGE_TYPE}"
echo "PACKAGECLOUD_DISTO is ${PACKAGECLOUD_DISTO}"
echo "VERSION is ${VERSION}"
if [[ "${PACKAGE_TYPE}" == "deb" ]]; then if [[ "${PACKAGE_TYPE}" == "deb" ]]; then
# install packagecloud.io # install packagecloud.io
apt-get install -y ruby-dev rubygems apt-get install -y ruby-dev rubygems
@ -50,16 +51,16 @@ aliases:
gem install -N package_cloud gem install -N package_cloud
# deploy the package # deploy the package
package_cloud push firstlookmedia/code/${PACKAGECLOUD_DISTO} deb_dist/dangerzone_${VERSION}-1_all.deb package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTO}" "deb_dist/dangerzone_${VERSION}-1_all.deb"
package_cloud push firstlookmedia/code/${PACKAGECLOUD_DISTO} deb_dist/dangerzone_${VERSION}-1.dsc package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTO}" "deb_dist/dangerzone_${VERSION}-1.dsc"
elif [[ "${PACKAGE_TYPE}" == "rpm" ]]; then elif [[ "${PACKAGE_TYPE}" == "rpm" ]]; then
# install packagecloud. # install packagecloud.
dnf install -y ruby-devel dnf install -y ruby-devel
gem install package_cloud gem install package_cloud
# deploy the package # deploy the package
package_cloud push firstlookmedia/code/${PACKAGECLOUD_DISTO} dist/dangerzone-${VERSION}-1.noarch.rpm package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTO}" "dist/dangerzone-${VERSION}-1.noarch.rpm"
package_cloud push firstlookmedia/code/${PACKAGECLOUD_DISTO} dist/dangerzone-${VERSION}-1.src.rpm package_cloud push "firstlookmedia/code/${PACKAGECLOUD_DISTO}" "dist/dangerzone-${VERSION}-1.src.rpm"
fi fi
jobs: jobs: