diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-03-19 09:03:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 09:03:07 -0400 |
| commit | dc5f3b562f4efdd5b8dea5a5271923af0e05363b (patch) | |
| tree | 4ecd23a47254627c0b047febac3351492fa10768 | |
| parent | 6577bf2a3023b3ca64a20a1bd434e98c1c1bd321 (diff) | |
Fix handling of nightly and release packages in GHA workflows. (#10819)
| -rw-r--r-- | .github/workflows/packaging.yml | 4 | ||||
| -rwxr-xr-x | packaging/scripts/install.sh | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 460126a3eb..2920246fd3 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -110,7 +110,7 @@ jobs: mkdir -p artifacts docker run --platform ${{ matrix.platform }} -v $PWD/artifacts:/artifacts local/package-builder:${{ matrix.distro }}${{ matrix.version }} - name: Upload - if: github.env.runtype == 'release' || github.env.runtype == 'nightly' || github.env.runtype == 'devel' + if: github.event_name == 'workflow_dispatch' shell: bash run: | # This figures out the distribution ID for the upload. @@ -120,7 +120,7 @@ jobs: -F "package[package_file]=@${pkgfile}" \ https://${{ secrets.PACKAGE_CLOUD_API_TOKEN }}:@packagecloud.io/api/v1/repos/${{ env.repo }}/packages.json || exit 1 - name: Clean - if: github.env.runtype == 'release' || github.env.runtype == 'nightly' || github.env.runtype == 'devel' + if: github.event_name == 'workflow_dispatch' shell: bash env: REPO: ${{ env.repo }} diff --git a/packaging/scripts/install.sh b/packaging/scripts/install.sh index 5418ecec46..dcad5aa882 100755 --- a/packaging/scripts/install.sh +++ b/packaging/scripts/install.sh @@ -20,8 +20,10 @@ install_fedora_like() { PKGMGR="$( (command -v dnf > /dev/null && echo "dnf") || echo "yum")" + pkg_version="$(echo "${VERSION}" | tr - .)" + # Install NetData - "$PKGMGR" install -y /artifacts/netdata-"${VERSION}"-*.rpm + "$PKGMGR" install -y /artifacts/netdata-"${pkg_version}"-*.rpm # Install testing tools "$PKGMGR" install -y curl nc jq @@ -33,11 +35,13 @@ install_centos() { PKGMGR="$( (command -v dnf > /dev/null && echo "dnf") || echo "yum")" + pkg_version="$(echo "${VERSION}" | tr - .)" + # Install EPEL (needed for `jq` "$PKGMGR" install -y epel-release # Install NetData - "$PKGMGR" install -y /artifacts/netdata-"${VERSION}"-*.rpm + "$PKGMGR" install -y /artifacts/netdata-"${pkg_version}"-*.rpm # Install testing tools "$PKGMGR" install -y curl nc jq @@ -47,10 +51,12 @@ install_suse_like() { # Using a glob pattern here because I can't reliably determine what the # resulting package name will be (TODO: There must be a better way!) + pkg_version="$(echo "${VERSION}" | tr - .)" + # Install NetData # FIXME: Allow unsigned packages (for now) #7773 zypper install -y --allow-unsigned-rpm \ - /artifacts/netdata-"${VERSION}"-*.rpm + /artifacts/netdata-"${pkg_version}"-*.rpm # Install testing tools zypper install -y --no-recommends \ |