Skip to content

Commit

Permalink
fix: Fix github workflows. (#565)
Browse files Browse the repository at this point in the history
* fix: Fix github workflows.

ubuntu-18.04 was deprecated and is no longer available.

* Remove broken packages from GitHub Actions runner (php from ppa:ondrej/php)

* Update vcpkg to 2023.04.15

---------

Co-authored-by: Ingo Bauersachs <ingo@jitsi.org>
  • Loading branch information
damencho and ibauersachs committed May 21, 2023
1 parent cefae49 commit 150396b
Show file tree
Hide file tree
Showing 6 changed files with 457 additions and 13 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/maven-and-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:

ubuntu:
name: Linux Static Natives ${{ matrix.arch }}
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs: javatest
strategy:
fail-fast: false
Expand All @@ -130,8 +130,18 @@ jobs:
path: target/native

- name: Install packages for native build
env:
DEBIAN_FRONTEND: noninteractive
run: |
if [ "${{ matrix.arch }}" != "x86" ] && [ "${{ matrix.arch }}" != "x86-64" ]; then
# Remove broken packages from pre-installed php in Actions image
# No longer needed in ubuntu-22.04
sudo apt-get remove -y libpcre2-dev libicu-dev icu-devtools
sudo apt-add-repository ppa:ondrej/php -y
sudo apt-get install -y aptitude
echo "Get::allow-downgrades \"true\";" | sudo tee /etc/apt/apt.conf.d/99-downgrades
echo "Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/99-downgrades
sudo ./resources/ubuntu-build-image/ppa-purge.sh ppa:ondrej/php -y true
if [ "${{ matrix.arch }}" != "i386" ] && [ "${{ matrix.arch }}" != "x86-64" ]; then
sudo cp -f resources/ubuntu-build-image/ports-sources.list /etc/apt/sources.list
fi
sudo ./resources/ubuntu-build-image/packages.sh ${{ matrix.arch }} ${{ env.RELEASE_JAVA_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion resources/ubuntu-build-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM ubuntu:focal

ARG ARCH=x86-64
ARG JAVA_VERSION=11
Expand Down
2 changes: 1 addition & 1 deletion resources/ubuntu-build-image/packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ PACKAGES+=(
"openjdk-$JAVA_VERSION-jdk:$DEBARCH")

DEBIAN_FRONTEND=noninteractive apt-get update && \
apt-get install --no-install-recommends -y "${PACKAGES[@]}" && \
apt-get install -o Debug::pkgProblemResolver=true -y "${PACKAGES[@]}" && \
rm -rf /var/lib/apt/lists/*
16 changes: 8 additions & 8 deletions resources/ubuntu-build-image/ports-sources.list
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu bionic-security main restricted universe multiverse
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu focal-security main restricted universe multiverse

deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ bionic main restricted universe multiverse
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted universe multiverse
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted universe multiverse
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ bionic-security main restricted universe multiverse
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe multiverse
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe multiverse
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted universe multiverse
deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse

0 comments on commit 150396b

Please sign in to comment.