Skip to content

Commit 8d1541b

Browse files
committed
build: Update Github Actions
1 parent 462e765 commit 8d1541b

File tree

4 files changed

+43
-62
lines changed

4 files changed

+43
-62
lines changed

.ci/scripts/do_build.sh

-40
This file was deleted.

.ci/scripts/do_tests.sh

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
# This script is for internal CI use only
4+
5+
set -e
6+
set -x
7+
8+
# prefer GNU commands
9+
realpath=$(command -v grealpath || :)
10+
realpath="${realpath:-realpath}"
11+
12+
# remove this script name and two dir levels to get the source root
13+
source_dir=$(dirname $(dirname $(dirname $($realpath -s $0))))
14+
15+
cd "${source_dir}/.."
16+
[ -e rtl_433_tests ] || git clone --depth 1 https://github.com/merbanan/rtl_433_tests.git
17+
cd rtl_433_tests
18+
export PATH="${source_dir}/build/src:$PATH"
19+
test -f "${source_dir}/build/src/rtl_433"
20+
21+
# python3 -m venv .venv
22+
# source .venv/bin/activate
23+
# pip install deepdiff
24+
make test

.github/workflows/check.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
name: Build with CMake
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@v3
9+
uses: actions/checkout@v4
1010
- name: Get latest CMake and Ninja
1111
uses: lukka/get-cmake@latest
1212
- name: Run CMake+Ninja
@@ -28,7 +28,7 @@ jobs:
2828
name: Build documentation
2929
steps:
3030
- name: Checkout
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
- name: Get latest CMake and Ninja
3333
uses: lukka/get-cmake@latest
3434
- name: "Install Doxygen"
@@ -46,14 +46,14 @@ jobs:
4646
runs-on: ubuntu-latest
4747
name: Check code style
4848
steps:
49-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
5050
- name: Style Check
5151
uses: ./.github/actions/style-check
5252
maintainer_update_check_job:
5353
runs-on: ubuntu-latest
5454
name: Needs maintainer_update
5555
steps:
56-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5757
- name: Working directory clean excluding untracked files
5858
run: |
5959
./maintainer_update.py
@@ -62,7 +62,7 @@ jobs:
6262
runs-on: ubuntu-latest
6363
name: Check symbol errors
6464
steps:
65-
- uses: actions/checkout@v3
65+
- uses: actions/checkout@v4
6666
- name: Symbolizer report
6767
run: |
6868
./tests/symbolizer.py check
@@ -77,7 +77,7 @@ jobs:
7777
runs-on: ubuntu-22.04
7878
name: Analyze with Clang
7979
steps:
80-
- uses: actions/checkout@v3
80+
- uses: actions/checkout@v4
8181
- name: Install Clang
8282
run: |
8383
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -

.github/workflows/release.yml

+13-16
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
#runs-on: ubuntu-latest
1717
runs-on: windows-latest
1818
steps:
19-
- uses: actions/cache@v3
19+
- uses: actions/cache@v4
2020
id: downloads
2121
with:
2222
path: ${{ runner.workspace }}/${{ env.pothos-exe }}
@@ -34,7 +34,7 @@ jobs:
3434
upload_url: ${{ steps.create_release.outputs.upload_url }}
3535
release_version: ${{ env.RELEASE_VERSION }}
3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3838
with:
3939
fetch-depth: 0
4040
- name: Create Release info
@@ -74,16 +74,15 @@ jobs:
7474
runs-on: ubuntu-latest
7575
name: Build with Mingw-w64 on ${{ matrix.arch }}
7676
steps:
77-
- uses: actions/checkout@v3
77+
- uses: actions/checkout@v4
7878
- name: "Install Mingw-w64"
7979
run: |
8080
sudo apt-get update -q -y
8181
sudo apt-get install -q -y gcc-mingw-w64-base binutils-mingw-w64-${{ matrix.arch }} gcc-mingw-w64-${{ matrix.arch }} mingw-w64-${{ matrix.arch }}-dev gcc-mingw-w64 gcc-multilib p7zip-full
8282
- name: "Build with Mingw-w64"
83-
env:
84-
RTLSDR: OFF
85-
CMAKE_TOOLCHAIN_FILE: cmake/Toolchain-gcc-mingw-w64-${{ matrix.arch }}.cmake
86-
run: ./.ci/scripts/do_build.sh
83+
run: |
84+
cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-gcc-mingw-w64-${{ matrix.arch }}.cmake -DENABLE_RTLSDR=OFF -B build
85+
cmake --build build
8786
- name: "Sysroot Build with Mingw-w64"
8887
run: ./.ci/scripts/do_sysroot.sh
8988
- name: "Upload Release Asset"
@@ -121,8 +120,8 @@ jobs:
121120
steps:
122121
- run: choco install openssl
123122
if: matrix.platform == 'x64'
124-
- uses: actions/checkout@v3
125-
- uses: actions/cache@v3
123+
- uses: actions/checkout@v4
124+
- uses: actions/cache@v4
126125
id: downloads
127126
if: matrix.platform == 'x64'
128127
with:
@@ -226,7 +225,7 @@ jobs:
226225
runs-on: ${{ matrix.os }}
227226
name: Build with CMake on ${{ matrix.os }}
228227
steps:
229-
- uses: actions/checkout@v3
228+
- uses: actions/checkout@v4
230229
- name: Install SDR
231230
run: |
232231
sudo apt-get update -q
@@ -273,7 +272,7 @@ jobs:
273272
distro: buster
274273
name: Build on ${{ matrix.distro }} ${{ matrix.arch }}
275274
steps:
276-
- uses: actions/checkout@v3
275+
- uses: actions/checkout@v4
277276
- uses: uraimo/[email protected]
278277
id: runcmd
279278
with:
@@ -309,11 +308,9 @@ jobs:
309308
uname -a
310309
lsb_release -sc || echo NO lsb_release
311310
echo Release ${{ needs.release_job.outputs.release_version }}
312-
mkdir build
313-
cd build
314-
cmake -DCMAKE_INSTALL_PREFIX:PATH=../dist ..
315-
cmake --build .
316-
cmake --build . --target install
311+
cmake -DCMAKE_INSTALL_PREFIX:PATH=../dist -B build
312+
cmake --build build
313+
cmake --build build --target install
317314
318315
- name: Install FPM
319316
run: |

0 commit comments

Comments
 (0)