Skip to content

Commit 33f69e1

Browse files
Merge branch 'espeak-ng:master' into master
2 parents fbd632b + 212928b commit 33f69e1

File tree

226 files changed

+1078793
-206403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+1078793
-206403
lines changed

.github/dependabot.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Keep GitHub Actions up to date with GitHub's Dependabot...
2+
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
3+
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
4+
version: 2
5+
updates:
6+
- package-ecosystem: github-actions
7+
directory: /
8+
groups:
9+
github-actions:
10+
patterns:
11+
- "*" # Group all Actions updates into a single larger pull request
12+
schedule:
13+
interval: weekly

.github/workflows/android.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,24 @@ jobs:
1616
config: [debug, release]
1717
include:
1818
- config: debug
19+
target: assembleDebug
1920
apkname: espeak-debug.apk
2021
- config: release
22+
target: assembleRelease
2123
apkname: espeak-release-unsigned.apk
2224
name: Build ${{ matrix.config }} APK
2325
steps:
24-
- uses: actions/checkout@v3
25-
- name: autoconf
26-
run: ./autogen.sh ; chmod -x INSTALL m4/*.m4
27-
- name: configure
28-
run: ./configure --with-gradle=$(pwd)/android/gradlew
26+
- uses: actions/checkout@v4
27+
- name: Set up JDK 17
28+
uses: actions/setup-java@v4
29+
with:
30+
distribution: 'temurin'
31+
java-version: 17
32+
cache: gradle
2933
- name: make
30-
run: make apk-${{ matrix.config }}
34+
run: cd android && ./gradlew ${{ matrix.target }} --no-daemon
3135
- name: upload
32-
uses: actions/upload-artifact@v3
36+
uses: actions/upload-artifact@v4
3337
with:
3438
name: android-${{ matrix.config }}.apk
3539
path: android/build/outputs/apk/${{ matrix.config }}/${{ matrix.apkname }}

.github/workflows/autoconf.yml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: Autoconf
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: [ master ]
7+
pull_request:
8+
branches: [ master ]
9+
10+
jobs:
11+
build:
12+
runs-on: ${{ matrix.os }}-${{ matrix.osver }}
13+
14+
name: "${{ matrix.os }} ${{ matrix.arch }}: ${{ matrix.compiler }}"
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
os: [ubuntu, macos]
19+
arch: [amd64, i386]
20+
compiler: [gcc, clang]
21+
22+
include:
23+
- os: ubuntu
24+
osver: 22.04
25+
- os: macos
26+
osver: 14
27+
28+
- arch: i386
29+
archcflags: "-m32 -msse2 -mfpmath=sse"
30+
31+
exclude:
32+
- os: macos
33+
arch: i386
34+
35+
steps:
36+
37+
# Linux - dependencies
38+
- name: apt-build-deps
39+
if: matrix.os == 'ubuntu'
40+
run: |
41+
sudo dpkg --add-architecture ${{ matrix.arch }}
42+
sudo apt-get update
43+
sudo apt-get install ronn kramdown python3
44+
- name: apt-arch-deps
45+
if: matrix.os == 'ubuntu'
46+
run: "sudo apt-get install libtool-bin valgrind g++-12-multilib linux-libc-dev:${{ matrix.arch }} libpcaudio-dev:${{ matrix.arch }} libsonic-dev:${{ matrix.arch }} libgcc-s1:${{ matrix.arch }}"
47+
- name: apt-compile-clang
48+
if: matrix.os == 'ubuntu' && matrix.compiler == 'clang'
49+
run: sudo apt-get install clang
50+
51+
# MacOS - dependencies
52+
- name: brew-deps
53+
if: matrix.os == 'macos'
54+
run: brew install libtool automake ronn OJFord/homebrew-formulae/kramdown
55+
- name: brew-compile-deps
56+
if: matrix.os == 'macos' && matrix.compiler == 'gcc'
57+
run: brew install gcc@12
58+
59+
# Checkout code
60+
- uses: actions/checkout@v4
61+
62+
# Configure
63+
- name: configure
64+
run: |
65+
./autogen.sh
66+
chmod -x INSTALL m4/*.m4
67+
[ 'x${{ matrix.compiler }}' = 'xgcc' ] && export CC="gcc-12"
68+
[ 'x${{ matrix.compiler }}' = 'xgcc' ] && export CXX="g++-12"
69+
[ 'x${{ matrix.compiler }}' = 'xclang' ] && export CC="clang"
70+
[ 'x${{ matrix.compiler }}' = 'xclang' ] && export CXX="clang++"
71+
export CFLAGS="-g -Og -fno-omit-frame-pointer ${{ matrix.archcflags }}"
72+
export CXXFLAGS="-g -Og -fno-omit-frame-pointer ${{ matrix.archcflags }}"
73+
./configure
74+
75+
- name: config-failed-upload
76+
if: ${{ failure() }}
77+
uses: actions/upload-artifact@v4
78+
with:
79+
name: config-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}.log
80+
path: config.log
81+
82+
# Build and test
83+
- name: build
84+
run: make all-am
85+
- name: test
86+
run: make check

0 commit comments

Comments
 (0)