From 0537543ef37d21f57d326b8b978f5579d3e6b2ec Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 19 May 2020 15:42:05 +0200
Subject: [PATCH] GitHub actions: publish packages

---
 .github/workflows/packages.yml | 71 +++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index f5a5105d1..9f9d043fa 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -13,12 +13,18 @@ jobs:
     strategy:
       matrix:
         distro:
-          - debian/buster
-          - debian/stretch
-          - debian/jessie
-          - ubuntu/focal
-          - ubuntu/bionic
-          - ubuntu/xenial
+          - name: debian
+            codename: buster
+          - name: debian
+            codename: stretch
+          - name: debian
+            codename: jessie
+          - name: ubuntu
+            codename: focal
+          - name: ubuntu
+            codename: bionic
+          - name: ubuntu
+            codename: xenial
 
     runs-on: ubuntu-latest
 
@@ -43,7 +49,7 @@ jobs:
             -e ICINGA_BUILD_PROJECT=icinga2 \
             -e ICINGA_BUILD_TYPE=snapshot \
             -e UPSTREAM_GIT_URL=file:///icinga2.git \
-            registry.icinga.com/build-docker/${{ matrix.distro }} \
+            registry.icinga.com/build-docker/${{ matrix.distro.name }}/${{ matrix.distro.codename }} \
             icinga-build-deb-source
 
       - name: Restore/backup ccache
@@ -51,7 +57,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: deb-icinga2/ccache
-          key: '${{ matrix.distro }}-ccache'
+          key: '${{ matrix.distro.name }}/${{ matrix.distro.codename }}-ccache'
 
       - name: Binary
         run: |
@@ -64,7 +70,7 @@ jobs:
             -w /deb-icinga2 \
             -e ICINGA_BUILD_PROJECT=icinga2 \
             -e ICINGA_BUILD_TYPE=snapshot \
-            registry.icinga.com/build-docker/${{ matrix.distro }} \
+            registry.icinga.com/build-docker/${{ matrix.distro.name }}/${{ matrix.distro.codename }} \
             icinga-build-deb-binary
 
       - name: Test
@@ -75,23 +81,38 @@ jobs:
             -w /deb-icinga2 \
             -e ICINGA_BUILD_PROJECT=icinga2 \
             -e ICINGA_BUILD_TYPE=snapshot \
-            registry.icinga.com/build-docker/${{ matrix.distro }} \
+            registry.icinga.com/build-docker/${{ matrix.distro.name }}/${{ matrix.distro.codename }} \
             icinga-build-test
+
+      - name: Artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: '${{ matrix.distro.name }}-${{ matrix.distro.codename }}-packages'
+          path: deb-icinga2/build
   rpm:
     name: .rpm
 
     strategy:
       matrix:
         distro:
-          - centos/8
-          - centos/7
-          - centos/6
-          - fedora/32
-          - fedora/31
-          - fedora/30
-          - fedora/29
-          - opensuse/15.1
-          - opensuse/15.0
+          - name: centos
+            release: 8
+          - name: centos
+            release: 7
+          - name: centos
+            release: 6
+          - name: fedora
+            release: 32
+          - name: fedora
+            release: 31
+          - name: fedora
+            release: 30
+          - name: fedora
+            release: 29
+          - name: opensuse
+            release: '15.1'
+          - name: opensuse
+            release: '15.0'
 
     runs-on: ubuntu-latest
 
@@ -110,7 +131,7 @@ jobs:
         uses: actions/cache@v1
         with:
           path: rpm-icinga2/ccache
-          key: '${{ matrix.distro }}-ccache'
+          key: '${{ matrix.distro.name }}/${{ matrix.distro.release }}-ccache'
 
       - name: Binary
         run: |
@@ -126,7 +147,7 @@ jobs:
             -e ICINGA_BUILD_PROJECT=icinga2 \
             -e ICINGA_BUILD_TYPE=snapshot \
             -e UPSTREAM_GIT_URL=file:///icinga2.git \
-            registry.icinga.com/build-docker/${{ matrix.distro }} \
+            registry.icinga.com/build-docker/${{ matrix.distro.name }}/${{ matrix.distro.release }} \
             icinga-build-package
 
       - name: Test
@@ -137,5 +158,11 @@ jobs:
             -w /rpm-icinga2 \
             -e ICINGA_BUILD_PROJECT=icinga2 \
             -e ICINGA_BUILD_TYPE=snapshot \
-            registry.icinga.com/build-docker/${{ matrix.distro }} \
+            registry.icinga.com/build-docker/${{ matrix.distro.name }}/${{ matrix.distro.release }} \
             icinga-build-test
+
+      - name: Artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: '${{ matrix.distro.name }}-${{ matrix.distro.release }}-packages'
+          path: rpm-icinga2/build