summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-02-15 03:25:26 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-02-15 03:26:11 +0000
commit412fb90f5888df13fdeafb5705b9ea6eef1a4df1 (patch)
treea33fe79d3373f32b30ff799e6e15331bd6975f76 /.github/workflows
parentReleasing debian version 1.33.0-1. (diff)
downloadnetdata-412fb90f5888df13fdeafb5705b9ea6eef1a4df1.tar.xz
netdata-412fb90f5888df13fdeafb5705b9ea6eef1a4df1.zip
Merging upstream version 1.33.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--.github/workflows/packaging.yml4
-rw-r--r--.github/workflows/repoconfig-packages.yml13
3 files changed, 15 insertions, 4 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 61e086670..abf08c2ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -461,7 +461,7 @@ jobs:
name: final-artifacts
path: final-artifacts
- name: Setup Gcloud
- uses: google-github-actions/setup-gcloud@v0.4.0
+ uses: google-github-actions/setup-gcloud@v0.5.0
with:
project_id: ${{ secrets.GCP_NIGHTLY_STORAGE_PROJECT }}
service_account_key: ${{ secrets.GCP_STORAGE_SERVICE_ACCOUNT_KEY }}
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index ca48f6ca2..38a78731b 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -52,8 +52,8 @@ jobs:
- {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm/v7, arch: armhf}
- {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm64/v8, arch: arm64}
- {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
- - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
- - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/arm64/v8, arch: arm64}
+ - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/amd64, arch: amd64}
+ - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/arm64/v8, arch: arm64}
- {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
- {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/arm/v7, arch: armhf}
- {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/arm64/v8, arch: arm64}
diff --git a/.github/workflows/repoconfig-packages.yml b/.github/workflows/repoconfig-packages.yml
index e5fee2f8a..b8d0ff67c 100644
--- a/.github/workflows/repoconfig-packages.yml
+++ b/.github/workflows/repoconfig-packages.yml
@@ -3,6 +3,16 @@
name: Repository Packages
on:
workflow_dispatch: null
+ pull_request:
+ paths:
+ - packaging/repoconfig/**
+ - .github/workflows/repoconfig-packages.yml
+ push:
+ branches:
+ - master
+ paths:
+ - packaging/repoconfig/**
+ - .github/workflows/repoconfig-packages.yml
env:
DO_NOT_TRACK: 1
jobs:
@@ -23,7 +33,7 @@ jobs:
- {distro: ubuntu, version: "20.04", pkgclouddistro: ubuntu/focal, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
- {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
- {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
- - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
+ - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/amd64, arch: amd64}
- {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
- {distro: fedora, version: "35", pkgclouddistro: fedora/35, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
- {distro: opensuse, version: "15.3", pkgclouddistro: opensuse/15.3, format: rpm, base_image: opensuse/leap, platform: linux/amd64, arch: amd64}
@@ -51,6 +61,7 @@ jobs:
-v $PWD:/netdata ${{ matrix.base_image }}:${{ matrix.version }} \
/netdata/packaging/repoconfig/build-${{ matrix.format }}.sh
- name: Upload Packages
+ if: github.event_name != 'pull_request' && github.repository == 'netdata/netdata'
shell: bash
env:
PKG_CLOUD_TOKEN: ${{ secrets.PACKAGE_CLOUD_API_KEY }}