Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update github actions to address warnings #2394

Merged
merged 4 commits into from
Oct 20, 2022
Merged

Update github actions to address warnings #2394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
288dbf4
Update github actions version for node.js 16
matt335672 Oct 19, 2022
23a3c85
Update github ::set-output usage
matt335672 Oct 19, 2022
5cbf0cb
Update legacy OS from 18.04 to 20.04
matt335672 Oct 19, 2022
18c5538
Add casts required for C++ CI and OpenSSL 3.x
matt335672 Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,19 @@ jobs:
- CC: gcc
feature_set: max
arch: i386
os: ubuntu-18.04
os: ubuntu-20.04
name_extra: for 32-bit arch (legacy OS)

- CC: g++
feature_set: max
arch: i386
os: ubuntu-18.04
os: ubuntu-20.04
name_extra: for 32-bit arch (legacy OS)

- CC: clang
feature_set: max
arch: i386
os: ubuntu-18.04
os: ubuntu-20.04
name_extra: for 32-bit arch (legacy OS)

name: ${{ matrix.feature_set }} features with ${{ matrix.CC }} ${{ matrix.name_extra }}
Expand All @@ -97,8 +97,8 @@ jobs:
CONF_FLAGS_amd64_max: "--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame
--enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter
--enable-pixman --with-imlib2 --with-freetype2"
CONF_FLAGS_i386_max: "--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame
--enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter
CONF_FLAGS_i386_max: "--enable-ipv6 --enable-jpeg --enable-mp3lame
--enable-opus --enable-rfxcodec --enable-painter
--disable-pixman --with-imlib2 --with-freetype2
--host=i686-linux"

Expand All @@ -115,7 +115,7 @@ jobs:
echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH_${{ matrix.arch }}" >> $GITHUB_ENV
echo "CFLAGS=$CFLAGS_${{ matrix.arch }}" >> $GITHUB_ENV
echo "LDFLAGS=$LDFLAGS_${{ matrix.arch }}" >> $GITHUB_ENV
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: sudo scripts/install_xrdp_build_dependencies_with_apt.sh ${{ matrix.feature_set }} ${{ matrix.arch }} --allow-downgrades --allow-remove-essential --allow-change-held-packages
- run: ./bootstrap
- run: ./configure $CONF_FLAGS
Expand All @@ -134,14 +134,13 @@ jobs:
CPPCHECK_REPO: https://github.com/danmar/cppcheck.git
steps:
# Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')
# see https://github.com/actions/cache/issues/543
- name: Get operating system name and version.
id: os
run: echo "::set-output name=image::$ImageOS"
run: echo "image=$ImageOS" >>$GITHUB_OUTPUT
shell: bash
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Cache cppcheck
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-cppcheck
with:
Expand All @@ -163,14 +162,13 @@ jobs:
ASTYLE_REPO: https://svn.code.sf.net/p/astyle/code/tags
steps:
# Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')
# see https://github.com/actions/cache/issues/543
- name: Get operating system name and version.
id: os
run: echo "::set-output name=image::$ImageOS"
run: echo "image=$ImageOS" >>$GITHUB_OUTPUT
shell: bash
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Cache astyle
uses: actions/cache@v2
uses: actions/cache@v3
env:
cache-name: cache-astyle
with:
Expand Down
4 changes: 2 additions & 2 deletions common/ssl_calls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ ssl_sha1_clear(void *sha1_info)
#else
if (sha1_info != NULL)
{
EVP_DigestInit_ex(sha1_info, g_md_sha1, NULL);
EVP_DigestInit_ex((EVP_MD_CTX *)sha1_info, g_md_sha1, NULL);
}
#endif
}
Expand Down Expand Up @@ -417,7 +417,7 @@ ssl_md5_clear(void *md5_info)
#else
if (md5_info != NULL)
{
EVP_DigestInit_ex(md5_info, g_md_md5, NULL);
EVP_DigestInit_ex((EVP_MD_CTX *)md5_info, g_md_md5, NULL);
}
#endif
}
Expand Down
9 changes: 6 additions & 3 deletions scripts/install_xrdp_build_dependencies_with_apt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ in
esac
;;
i386)
# This list is not as complete as the amd64 list. It currently
# supports 32-bit CI building only, rather than being a generic
# build support tool.
# - Ubuntu 18.04 -> 20.04
# Removed fdk-aac-dev:i386 and libfuse-dev:i386
PACKAGES="$PACKAGES \
g++-multilib \
gcc-multilib \
Expand All @@ -112,16 +117,14 @@ in
libjpeg-dev:i386 \
libimlib2-dev:i386 \
libmp3lame-dev:i386 \
libfdk-aac-dev:i386 \
libopus-dev:i386 \
libpam0g-dev:i386 \
libssl-dev:i386 \
libx11-dev:i386 \
libxext-dev:i386 \
libxfixes-dev:i386 \
libxrandr-dev:i386 \
libxrender-dev:i386 \
libfuse-dev:i386"
libxrender-dev:i386"

dpkg --add-architecture i386
dpkg --print-architecture
Expand Down