Skip to content

Commit 9b53a55

Browse files
authored
Merge pull request #1954 from havardAasen/gh-action-checkout
GH Actions: Fix deprecation warnings and build on Ubuntu
2 parents 3b3466c + deb0f0f commit 9b53a55

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,21 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
os: [ubuntu-18.04, ubuntu-20.04, ubuntu-latest]
24+
os: [ubuntu-20.04, ubuntu-latest]
2525

2626
# Steps represent a sequence of tasks that will be executed as part of the job
2727
steps:
2828
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v3
3030
with:
3131
submodules: recursive
3232

3333
# Runs a single command using the runners shell
3434
- name: Install Deps
35-
env:
36-
ACCEPT_EULA: Y
3735
run: |
3836
sudo apt-get update
39-
sudo env ACCEPT_EULA=Y apt-get upgrade
40-
sudo apt-get install lcov swig xsltproc rpm-common lua5.3 libyaml-dev libapt-pkg-dev libdbus-1-dev libdbus-glib-1-dev libcurl4-openssl-dev libgcrypt-dev libselinux1-dev libgconf2-dev libacl1-dev libblkid-dev libcap-dev libxml2-dev libxslt1-dev libxml-parser-perl libxml-xpath-perl libperl-dev librpm-dev librtmp-dev libxmlsec1-dev libxmlsec1-openssl
41-
sudo apt-get remove rpm
37+
sudo apt-get -y install lcov swig xsltproc rpm-common lua5.3 libyaml-dev libapt-pkg-dev libdbus-1-dev libdbus-glib-1-dev libcurl4-openssl-dev libgcrypt-dev libselinux1-dev libgconf2-dev libacl1-dev libblkid-dev libcap-dev libxml2-dev libxslt1-dev libxml-parser-perl libxml-xpath-perl libperl-dev librpm-dev librtmp-dev libxmlsec1-dev libxmlsec1-openssl
38+
sudo apt-get -y remove rpm
4239
4340
# Runs a set of commands using the runners shell
4441
- name: Build
@@ -61,7 +58,7 @@ jobs:
6158
- name: Install Deps
6259
run: dnf install -y cmake git dbus-devel GConf2-devel libacl-devel libblkid-devel libcap-devel libcurl-devel libgcrypt-devel libselinux-devel libxml2-devel libxslt-devel libattr-devel make openldap-devel pcre-devel perl-XML-Parser perl-XML-XPath perl-devel python3-devel rpm-devel swig bzip2-devel gcc-c++ libyaml-devel xmlsec1-devel xmlsec1-openssl-devel hostname bzip2 lua rpm-build which strace
6360
- name: Checkout
64-
uses: actions/checkout@v2
61+
uses: actions/checkout@v3
6562
with:
6663
submodules: recursive
6764
- name: Build
@@ -82,7 +79,7 @@ jobs:
8279
# Steps represent a sequence of tasks that will be executed as part of the job
8380
steps:
8481
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
85-
- uses: actions/checkout@v2
82+
- uses: actions/checkout@v3
8683

8784
# Runs a single command using the runners shell
8885
- name: Install Deps

.github/workflows/codeql.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
language: [ 'cpp', 'python', 'javascript' ]
24+
language: [ 'cpp', 'python' ]
2525
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
2626
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
2727

@@ -30,13 +30,10 @@ jobs:
3030
uses: actions/checkout@v3
3131

3232
- name: Install Deps
33-
env:
34-
ACCEPT_EULA: Y
3533
run: |
3634
sudo apt-get update
37-
sudo env ACCEPT_EULA=Y apt-get upgrade
38-
sudo apt-get install lcov swig xsltproc rpm-common lua50 libyaml-dev libapt-pkg-dev libdbus-1-dev libdbus-glib-1-dev libcurl4-openssl-dev libgcrypt-dev libselinux1-dev libgconf2-dev libacl1-dev libblkid-dev libcap-dev libxml2-dev libxslt1-dev libxml-parser-perl libxml-xpath-perl libperl-dev librpm-dev librtmp-dev libxmlsec1-dev libxmlsec1-openssl
39-
sudo apt-get remove rpm
35+
sudo apt-get -y install lcov swig xsltproc rpm-common lua5.3 libyaml-dev libapt-pkg-dev libdbus-1-dev libdbus-glib-1-dev libcurl4-openssl-dev libgcrypt-dev libselinux1-dev libgconf2-dev libacl1-dev libblkid-dev libcap-dev libxml2-dev libxslt1-dev libxml-parser-perl libxml-xpath-perl libperl-dev librpm-dev librtmp-dev libxmlsec1-dev libxmlsec1-openssl
36+
sudo apt-get -y remove rpm
4037
4138
# Initializes the CodeQL tools for scanning.
4239
- name: Initialize CodeQL

0 commit comments

Comments
 (0)