Skip to content

Commit 392be63

Browse files
committed
webOS: build wayland and GLES v3 by default, update action versions
1 parent a617aed commit 392be63

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

.github/workflows/webOS.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
uses: actions/checkout@v4
2626

2727
- name: Download ares-cli-rs
28-
uses: robinraju/release-downloader@v1.11
28+
uses: robinraju/release-downloader@v1
2929
with:
3030
repository: "webosbrew/ares-cli-rs"
3131
latest: true
3232
fileName: "ares-package_*.deb"
3333
out-file-path: "temp"
3434

3535
- name: Download Manifest Generator
36-
uses: robinraju/release-downloader@v1.9
36+
uses: robinraju/release-downloader@v1
3737
with:
3838
repository: "webosbrew/dev-toolbox-cli"
3939
latest: true
@@ -47,7 +47,7 @@ jobs:
4747
run: sudo apt-get -yq install ./temp/*.deb
4848

4949
- name: Download webOS NDK
50-
uses: robinraju/release-downloader@v1.11
50+
uses: robinraju/release-downloader@v1
5151
with:
5252
repository: "openlgtv/buildroot-nc4"
5353
latest: true
@@ -68,38 +68,40 @@ jobs:
6868
RARCH_VERSION=$(grep -Po '(?<=#define PACKAGE_VERSION ")[^"]+' version.all)
6969
echo "RARCH_VERSION=$RARCH_VERSION" >> "$GITHUB_ENV"
7070
71-
- name: Compile RA (GLES3 and Wayland variant)
71+
- name: Compile RA (GLES2, no wayland legacy variant)
7272
shell: bash
7373
run: |
7474
. /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
7575
export SDK_PATH=/tmp/arm-webos-linux-gnueabi_sdk-buildroot
7676
make -f Makefile.webos clean
77-
bash gfx/common/wayland/generate_wayland_protos.sh
7877
make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 \
79-
HAVE_XKBCOMMON=1 HAVE_USERLAND=1 HAVE_EGL=1 HAVE_WAYLAND=1 \
80-
HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1 HAVE_OPENGLES3_2=1 -j"$(getconf _NPROCESSORS_ONLN)"
78+
-j"$(getconf _NPROCESSORS_ONLN)"
8179
mv webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \
82-
webos/com.retroarch.webos.gles3w_${RARCH_VERSION}_arm.ipk
80+
webos/com.retroarch.webos-legacy-gles2-no-wayland_${RARCH_VERSION}_arm.ipk
8381
env:
8482
DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
8583

86-
- name: Upload GLES3 and Wayland artifact
87-
uses: actions/upload-artifact@v4
84+
- name: Upload GLES2 artifact
85+
uses: actions/upload-artifact@v6
8886
with:
89-
name: com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
90-
path: webos/com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_arm.ipk
87+
name: com.retroarch.webos-legacy-gles2-no-wayland_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
88+
path: webos/com.retroarch.webos-legacy-gles2-no-wayland_${{ env.RARCH_VERSION }}_arm.ipk
9189

9290
- name: Compile RA (default)
9391
shell: bash
9492
run: |
9593
. /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
94+
export SDK_PATH=/tmp/arm-webos-linux-gnueabi_sdk-buildroot
9695
make -f Makefile.webos clean
97-
make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 -j"$(getconf _NPROCESSORS_ONLN)"
96+
bash gfx/common/wayland/generate_wayland_protos.sh
97+
make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 \
98+
HAVE_XKBCOMMON=1 HAVE_USERLAND=1 HAVE_EGL=1 HAVE_WAYLAND=1 \
99+
HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1 HAVE_OPENGLES3_2=1 -j"$(getconf _NPROCESSORS_ONLN)"
98100
env:
99101
DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
100102

101103
- name: Upload default artifact
102-
uses: actions/upload-artifact@v4
104+
uses: actions/upload-artifact@v6
103105
with:
104106
name: com.retroarch.webos_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
105107
path: webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
@@ -125,5 +127,5 @@ jobs:
125127
omitPrereleaseDuringUpdate: true
126128
artifacts: |
127129
webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
128-
webos/com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_arm.ipk
130+
webos/com.retroarch.webos-legacy-gles2-no-wayland_${{ env.RARCH_VERSION }}_arm.ipk
129131
webos/${{ env.PACKAGE_NAME }}.manifest.json

0 commit comments

Comments
 (0)