diff --git a/.drone.yml b/.drone.yml index 91d63ad97..4b2ec3be8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -194,6 +194,34 @@ steps: commands: - . .drone/update-deb-packages.sh +### +### Update the Ubuntu (latest) packages +### + +- name: update-ubuntu-packages + image: ubuntu:latest + volumes: + - name: repos + path: /repos + + environment: + DEB_VERSION: ubuntu + WORKDIR: /tmp/workdir + APT_ROOT: /repos/apt + PKG_NAME: platypush + + when: + branch: + - master + event: + - push + + depends_on: + - update-components-cache + + commands: + - . .drone/update-deb-packages.sh + ### ### Updates the APT repository after new packages have been pushed ### @@ -221,6 +249,7 @@ steps: depends_on: - update-debian-stable-packages - update-debian-oldstable-packages + - update-ubuntu-packages commands: - . .drone/update-apt-repo.sh diff --git a/.drone/update-apt-repo.sh b/.drone/update-apt-repo.sh index 5cc849cdd..dd757d24f 100755 --- a/.drone/update-apt-repo.sh +++ b/.drone/update-apt-repo.sh @@ -1,6 +1,5 @@ #!/bin/sh - [ -f .skipci ] && exit 0 echo "-- Installing dependencies" @@ -105,39 +104,43 @@ Steps: 1. Add this repository's PGP key to your apt keyring ==================================================== -$ sudo wget -q -O \\\ +# wget -q -O \\\ /etc/apt/trusted.gpg.d/platypush.asc \\\ https://apt.platypush.tech/pubkey.txt 2. Add the repository to your sources ===================================== -$ sudo wget -q -O \\\ +# wget -q -O \\\ /etc/apt/sources.list.d/platypush.list \\\ https://apt.platypush.tech/lists/platypush--.list Where: -- deb_version can be either *stable* (for the current Debian stable version) or - *oldstable* (for the previous Debian stable version) -- branch can be either *main* (for the latest releases) or *dev* (for a package - that is always in sync with the git version) +- deb_version can be: + - *stable* - current Debian stable version + - *oldstable* - previous Debian stable version + - *ubuntu* - latest Ubuntu version + +- branch can be either: + - *main* - latest stable release + - *dev* a package always in sync with the git version For example, to install the latest stable tags on Debian stable: -$ sudo wget -q -O \\\ +# wget -q -O \\\ /etc/apt/sources.list.d/platypush.list \\\ https://apt.platypush.tech/lists/platypush-stable-main.list 3. Update your repos ==================== -$ sudo apt update +# apt update 4. Install Platypush ==================== -$ sudo apt install platypush +# apt install platypush EOF echo "-- Importing and refreshing PGP key" diff --git a/.drone/update-deb-packages.sh b/.drone/update-deb-packages.sh index 13a256af6..74264ccb9 100755 --- a/.drone/update-deb-packages.sh +++ b/.drone/update-deb-packages.sh @@ -9,6 +9,7 @@ cp -r "$PWD" "$SRCDIR" cd "$SRCDIR" echo "-- Installing dependencies" +export DEBIAN_FRONTEND=noninteractive apt update apt install -y curl dpkg-dev gpg git python3 python3-pip python3-setuptools diff --git a/.drone/update-rpm-repo.sh b/.drone/update-rpm-repo.sh index 1d2bf380a..bf6c49381 100755 --- a/.drone/update-rpm-repo.sh +++ b/.drone/update-rpm-repo.sh @@ -235,16 +235,16 @@ Steps: 1. Add the repository to your sources ===================================== -$ sudo yum config-manager --add-repo https://rpm.platypush.tech/platypush.repo +# yum config-manager --add-repo https://rpm.platypush.tech/platypush.repo 2. Install Platypush ==================== -$ sudo yum install platypush +# yum install platypush Or, if you want to install a version always up-to-date with the git repo: -$ sudo yum install platypush-git +# yum install platypush-git EOF cat < "$TMP_RPM_ROOT/pubkey.txt" diff --git a/README.md b/README.md index a6e733608..2b87fcc62 100644 --- a/README.md +++ b/README.md @@ -795,51 +795,49 @@ or tags. #### Debian/Ubuntu -Currently the following releases are supported: +1. Add the Platypush APT key to your trusted keyring: -1. The current Debian `stable` -2. Debian `oldstable` + ``` + # wget -q -O \ + /etc/apt/trusted.gpg.d/platypush.asc \ + https://apt.platypush.tech/pubkey.txt + ``` -Ubuntu supported [to be added -soon](https://git.platypush.tech/platypush/platypush/issues/368). +2. Add the Platypush repository to your APT sources: -- Add the Platypush APT key to your trusted keyring: + ``` + # wget -q -O \ + /etc/apt/sources.list.d/platypush.list \ + https://apt.platypush.tech/lists/platypush--.list + ``` -``` -# wget -q -O \ - /etc/apt/trusted.gpg.d/platypush.asc \ - https://apt.platypush.tech/pubkey.txt -``` + Where: -- Add the Platypush repository to your APT sources: + - `deb_version` can be either: -``` -# wget -q -O \ - /etc/apt/sources.list.d/platypush.list \ - https://apt.platypush.tech/lists/platypush--.list -``` + - `stable`: current Debian stable + - `oldstable`: previous Debian stable + - `ubuntu`: latest Ubuntu release -Where: + - `branch` can be either: -- `deb_version` can be either *stable* (for the current Debian stable version) or - *oldstable* (for the previous Debian stable version) -- `branch` can be either *main* (for the latest releases) or *dev* (for a package - that is always in sync with the git version) + - `main`: latest stable release + - `dev`: a package always in sync with the latest git version -For example, to install the latest stable tags on Debian stable: + For example, to install the latest stable tags on Debian stable: -``` -# wget -q -O \ - /etc/apt/sources.list.d/platypush.list \ - https://apt.platypush.tech/lists/platypush-stable-main.list -``` + ``` + # wget -q -O \ + /etc/apt/sources.list.d/platypush.list \ + https://apt.platypush.tech/lists/platypush-stable-main.list + ``` -- Update your repos and install Platypush: +3. Update your repos and install Platypush: -``` -# apt update -# apt install platypush -``` + ``` + # apt update + # apt install platypush + ``` #### Fedora