On Fri, 10 Jun 2022 07:14:33 GMT, Aleksey Shipilev <sh...@openjdk.org> wrote:
>> .github/workflows/build-cross-compile.yml line 89: >> >>> 87: sudo apt-get install gcc-${{ inputs.apt-gcc-version }} >>> g++-${{ inputs.apt-gcc-version }} libxrandr-dev${{ inputs.apt-architecture >>> }} libxtst-dev${{ inputs.apt-architecture }} libcups2-dev${{ >>> inputs.apt-architecture }} libasound2-dev${{ inputs.apt-architecture }} >>> 88: sudo update-alternatives --install /usr/bin/gcc gcc >>> /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 >>> 89: sudo apt-get install gcc-10-${{ matrix.gnu-arch >>> }}-linux-gnu${{ matrix.gnu-abi}}=10.3.0-1ubuntu1~20.04cross1 g++-10-${{ >>> matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=10.3.0-1ubuntu1~20.04cross1 >> >> Should `10.3.0-1ubuntu1~20.04cross1` also go into common "var", like >> `apt-gcc-version` did? > > Also, I think we can speed up this part by merging two `apt-get install` > invocation lines together. It was separate before, because it was two steps, > unnecessary now. Ideally, all version information should be centralized somewhere. I plan to take a second round on this code when it's been pushed to try to figure out the best way to achieve this. (Possibly in github-versions.conf, possibly in main.yml, depending on what makes the most sense given the GHA limitations). But I can extract out the cross-compilation suffix already in this PR, yes. ------------- PR: https://git.openjdk.org/jdk/pull/9063