diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml index cf4644a..268e9fc 100644 --- a/.github/actions/deploy-ubuntu/action.yml +++ b/.github/actions/deploy-ubuntu/action.yml @@ -117,13 +117,8 @@ runs: cat /etc/apt/sources.list for f in /etc/apt/sources.list.d/*.list; do echo "$f:"; cat $f; done $SUDO apt-get update - $SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH libpulse-dev:$ARCH libdrm-dev:$ARCH - $SUDO apt-get -y install pkgconf ccache clang $TOOLCHAIN openjdk-8-jdk-headless ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev - mkdir -p debs - pushd debs - apt-get -y download libva-dev:$ARCH libva2:$ARCH - $SUDO dpkg --force-all -i *.deb - popd + $SUDO apt-get -y install gcc-multilib g++-multilib gfortran-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH libpulse-dev:$ARCH libdrm-dev:$ARCH libva-dev:$ARCH + $SUDO apt-get -y install pkgconf ccache clang $TOOLCHAIN openjdk-8-jdk ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake cmake make libtool bison flex perl nasm ragel curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index 5ddd0f4..9d87673 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -21,7 +21,7 @@ permissions: contents: write jobs: # android-arm: - # runs-on: ubuntu-20.04 + # runs-on: ubuntu-22.04 # strategy: # matrix: # gpl: ["false", "true"] @@ -29,7 +29,7 @@ jobs: # - uses: actions/checkout@v4 # - uses: ./.github/actions/deploy-ubuntu # android-arm64: - # runs-on: ubuntu-20.04 + # runs-on: ubuntu-22.04 # strategy: # matrix: # gpl: ["false", "true"] @@ -37,7 +37,7 @@ jobs: # - uses: actions/checkout@v4 # - uses: ./.github/actions/deploy-ubuntu # android-x86: - # runs-on: ubuntu-20.04 + # runs-on: ubuntu-22.04 # strategy: # matrix: # gpl: ["false", "true"] @@ -45,7 +45,7 @@ jobs: # - uses: actions/checkout@v4 # - uses: ./.github/actions/deploy-ubuntu # android-x86_64: - # runs-on: ubuntu-20.04 + # runs-on: ubuntu-22.04 # strategy: # matrix: # gpl: ["false", "true"] @@ -53,7 +53,7 @@ jobs: # - uses: actions/checkout@v4 # - uses: ./.github/actions/deploy-ubuntu linux-arm: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: gpl: ["false", "true"] @@ -64,7 +64,7 @@ jobs: with: gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }} linux-arm64: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: gpl: ["false", "true"] @@ -75,7 +75,7 @@ jobs: with: gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }} linux-ppc64le: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: gpl: ["false", "true"] @@ -86,7 +86,7 @@ jobs: with: gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }} linux-x86: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: gpl: ["false", "true"] @@ -97,7 +97,7 @@ jobs: with: gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }} linux-x86_64: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: gpl: ["false", "true"] @@ -142,13 +142,13 @@ jobs: # redeploy: # needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-arm, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64] # needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64] -# runs-on: ubuntu-20.04 +# runs-on: ubuntu-22.04 # steps: # - uses: actions/checkout@v4 # - uses: ./.github/actions/redeploy deploy-kotlin: name: Publish Kotlin artifacts - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/deploy-kotlin