Skip to content

Commit 567d645

Browse files
jbleyeljbleyel
committed
update github actions
1 parent 504b500 commit 567d645

File tree

7 files changed

+44
-79
lines changed

7 files changed

+44
-79
lines changed

‎.github/workflows/SonarCloud.yml‎

Lines changed: 6 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,14 @@ jobs:
88
build:
99
name: Build
1010
runs-on: ubuntu-24.04
11+
container:
12+
image: ghcr.io/openatv/enigma2-buildenv/enigma2-buildenv:latest
13+
options: --user root
1114
env:
1215
# SONAR_SCANNER_VERSION: 4.7.0.2747
1316
# SONAR_SERVER_URL: "https://sonarcloud.io"
1417
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
1518
steps:
16-
- name: Install libraries
17-
run: |
18-
sudo apt-get -q update
19-
for i in {1..5}; do
20-
sudo add-apt-repository -y ppa:deadsnakes/ppa && break || sleep 10
21-
done
22-
sudo apt remove -y libunwind-14-dev
23-
sudo apt-get install g++-14
24-
sudo apt-get install linux-libc-dev
25-
sudo apt-get install git
26-
sudo apt-get install build-essential
27-
sudo apt-get install automake
28-
sudo apt-get install libtool
29-
sudo apt-get install python3.13-dev
30-
sudo apt-get install zlib1g-dev
31-
sudo apt-get install gettext
32-
sudo apt-get install swig
33-
sudo apt-get install libgstreamer1.0-dev
34-
sudo apt-get install libgstreamer-plugins-base1.0-dev
35-
sudo apt-get install libfreetype6-dev
36-
sudo apt-get install libfribidi-dev
37-
sudo apt-get install libavahi-client-dev
38-
sudo apt-get install libjpeg-turbo8-dev
39-
sudo apt-get install libgif-dev
40-
sudo apt-get install libcurl4-openssl-dev
41-
sudo apt-get install mm-common
42-
4319
- uses: actions/checkout@v4
4420
with:
4521
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
@@ -50,47 +26,6 @@ jobs:
5026
- uses: actions/setup-python@v5
5127
with:
5228
python-version: '3.13'
53-
54-
- name: Build enigma2 dependencies
55-
env:
56-
CC: "gcc-14"
57-
CXX: "g++-14"
58-
run: |
59-
echo "installing libdvbsi++"
60-
pushd .
61-
cd /tmp
62-
git clone --depth 1 https://github.com/oe-alliance/libdvbsi.git
63-
cd libdvbsi
64-
autoreconf -i
65-
./configure
66-
make
67-
sudo make install
68-
popd
69-
echo "installing libsigc++-3"
70-
pushd .
71-
cd /tmp
72-
git clone --depth 1 https://github.com/TwolDE2/libsigc--3.0.git
73-
cd libsigc--3.0
74-
autoreconf -i
75-
./configure
76-
make
77-
sudo make install
78-
popd
79-
echo "installing tuxbox"
80-
pushd .
81-
cd /tmp
82-
git clone --depth 1 https://github.com/oe-alliance/tuxtxt.git
83-
cd tuxtxt/libtuxtxt
84-
autoreconf -i
85-
./configure --with-boxtype=generic DVB_API_VERSION=5
86-
make
87-
sudo make install
88-
cd ../tuxtxt
89-
autoreconf -i
90-
./configure --with-boxtype=generic DVB_API_VERSION=5
91-
make
92-
sudo make install
93-
popd
9429

9530
- name: Install sonar-scanner and build-wrapper
9631
uses: SonarSource/sonarcloud-github-c-cpp@v2
@@ -101,7 +36,9 @@ jobs:
10136
run: |
10237
sed -i 's/include lib main data po tools/include lib main tools/g' Makefile.am
10338
autoreconf -i
104-
./configure --with-libsdl=no --with-boxtype=nobox --enable-dependency-tracking ac_cv_prog_c_openmp=-fopenmp --with-gstversion=1.0 --with-textlcd
39+
export LIBS="-L/usr/lib/x86_64-linux-gnu -lpython3.13"
40+
export CPPFLAGS="-I/usr/include/python3.13"
41+
./configure PYTHON=python3.13 --with-libsdl=no --with-boxtype=nobox --enable-dependency-tracking ac_cv_prog_c_openmp=-fopenmp --with-gstversion=1.0 --with-textlcd
10542
build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make
10643
10744
- name: Run sonar-scanner

‎.github/workflows/build.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: enigma2 build
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
workflow_dispatch:
9+
10+
jobs:
11+
build:
12+
name: Build enigma2
13+
runs-on: ubuntu-24.04
14+
container:
15+
image: ghcr.io/openatv/enigma2-buildenv/enigma2-buildenv:latest
16+
options: --user root
17+
steps:
18+
- uses: actions/checkout@v4
19+
20+
- name: Build enigma2
21+
env:
22+
CC: "gcc-14"
23+
CXX: "g++-14"
24+
run: |
25+
echo "compiling enigma2"
26+
autoreconf -i
27+
export LIBS="-L/usr/lib/x86_64-linux-gnu -lpython3.13"
28+
export CPPFLAGS="-I/usr/include/python3.13"
29+
./configure PYTHON=python3.13 --with-libsdl=no --with-boxtype=nobox --enable-dependency-tracking ac_cv_prog_c_openmp=-fopenmp --with-gstversion=1.0 --with-textlcd
30+
make
31+
python3.13 -m compileall .
32+
echo done!

‎.github/workflows/enigma2.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
name: enigma2 build
1+
name: enigma2 build old
22

33
on:
4-
push:
5-
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
4+
workflow_dispatch:
85

96
jobs:
107
build:
@@ -101,7 +98,6 @@ jobs:
10198
CC: "gcc-${{ matrix.gcc }}"
10299
CXX: "g++-${{ matrix.gcc }}"
103100
run: |
104-
pip3 install six
105101
echo "compiling enigma2"
106102
autoreconf -i
107103
./configure --with-libsdl=no --with-boxtype=nobox --enable-dependency-tracking ac_cv_prog_c_openmp=-fopenmp --with-gstversion=1.0 --with-textlcd

‎.github/workflows/mergepo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
with:
1313
ref: 'master'
1414

‎.github/workflows/updatepot.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
ref: 'master'
1414

1515
- uses: jbleyel/gettext-action@v1
16-
16+
1717
- name: updatepot
1818
run: |
1919
git config --global user.email "bot@openatv.com"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Build status
44

5-
[![enigma2 build](https://github.com/openatv/enigma2/actions/workflows/enigma2.yml/badge.svg)](https://github.com/openatv/enigma2/actions/workflows/enigma2.yml)
5+
[![enigma2 build](https://github.com/openatv/enigma2/actions/workflows/build.yml/badge.svg)](https://github.com/openatv/enigma2/actions/workflows/build.yml)
66

77
[Active Build Status](https://images.mynonpublic.com/openatv/build_status_arm_751.html "Active Build Status") - shows which box is currently being built
88

‎sonar-project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ sonar.projectVersion=7.6
99
#sonar.sources=.
1010

1111
# Encoding of the source code. Default is default system encoding
12-
#sonar.sourceEncoding=UTF-8
12+
sonar.sourceEncoding=UTF-8
1313

1414
sonar.python.version=3.13
1515
sonar.cfamily.cache.enabled=false

0 commit comments

Comments
 (0)