From c9c2ed18558b81e7444282f516515deef58cd76d Mon Sep 17 00:00:00 2001
From: Lukas Hutak <lukas.hutak@cesnet.cz>
Date: Thu, 23 Apr 2020 16:58:07 +0200
Subject: [PATCH] GitHub Actions: remove Ubuntu 19.04 (EOL), fix name of
 artifacts

---
 .github/workflows/main.yml     | 2 +-
 .github/workflows/packages.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c1e96d76..137e3092 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: ['ubuntu:18.04', 'ubuntu:19.04', 'ubuntu:20.04', 'debian:stretch', 'debian:buster', 'debian:bullseye', 'centos:7', 'centos:8', 'fedora:29', 'fedora:30', 'fedora:31']
+        image: ['ubuntu:18.04', 'ubuntu:20.04', 'debian:stretch', 'debian:buster', 'debian:bullseye', 'centos:7', 'centos:8', 'fedora:29', 'fedora:30', 'fedora:31']
 
     name: Build on ${{ matrix.image }}
     container: ${{ matrix.image }}
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 295060e0..562dad3a 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: ['ubuntu:18.04', 'ubuntu:19.04', 'ubuntu:20.04', 'debian:stretch', 'debian:buster', 'debian:bullseye']
+        image: ['ubuntu:18.04', 'ubuntu:20.04', 'debian:stretch', 'debian:buster', 'debian:bullseye']
 
     name: Build DEBs on ${{ matrix.image }}
     container: ${{ matrix.image }}
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Define global variables
-      run: echo "::set-output name=zip_file::libfds-${IMAGE//:/}-$GITHUB_SHA.zip"
+      run: echo "::set-output name=zip_file::ipfixcol2-${IMAGE//:/}-$GITHUB_SHA.zip"
       shell: bash
       env:
         IMAGE: ${{ matrix.image }}
@@ -94,7 +94,7 @@ jobs:
     - uses: actions/checkout@v1
     - name: Prepare environment and variables
       run: |
-        echo "::set-output name=zip_file::libfds-${IMAGE//:/}-$GITHUB_SHA.zip"
+        echo "::set-output name=zip_file::ipfixcol2-${IMAGE//:/}-$GITHUB_SHA.zip"
         mkdir -p build/libfds_repo
       env:
         IMAGE: ${{ matrix.image }}