kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-23 20:15:19 -07:00
Code Releases Wiki Activity

dotnet-core: build on Ubuntu 18.04, don't import backports

Browse Source 
Backports are going to be removed in a couple weeks when the
distro will reach EOL.
This commit is contained in:
Frank Denis 2022-11-23 19:56:12 +01:00
parent 15c4730042
commit 4a5f4a8158
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
.github/workflows/dotnet-core.yml vendored
View File

@ -58,13 +58,12 @@ jobs:
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
cat <<-EOF | tee /etc/apt/sources.list.d/arm64.list >/dev/null cat <<-EOF | tee /etc/apt/sources.list.d/arm64.list >/dev/null
deb [arch=arm64] http://ports.ubuntu.com/ xenial main restricted deb [arch=arm64] http://ports.ubuntu.com/ bionic main restricted
deb [arch=arm64] http://ports.ubuntu.com/ xenial-updates main restricted deb [arch=arm64] http://ports.ubuntu.com/ bionic-updates main restricted
deb [arch=arm64] http://ports.ubuntu.com/ xenial universe deb [arch=arm64] http://ports.ubuntu.com/ bionic universe
deb [arch=arm64] http://ports.ubuntu.com/ xenial-updates universe deb [arch=arm64] http://ports.ubuntu.com/ bionic-updates universe
deb [arch=arm64] http://ports.ubuntu.com/ xenial multiverse deb [arch=arm64] http://ports.ubuntu.com/ bionic multiverse
deb [arch=arm64] http://ports.ubuntu.com/ xenial-updates multiverse deb [arch=arm64] http://ports.ubuntu.com/ bionic-updates multiverse
deb [arch=arm64] http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse
EOF EOF
sed -i 's/deb h/deb [arch=amd64] h/g' /etc/apt/sources.list sed -i 's/deb h/deb [arch=amd64] h/g' /etc/apt/sources.list
@ -96,20 +95,19 @@ jobs:
path: .libsodium-build/lib/libsodium.so path: .libsodium-build/lib/libsodium.so
build-linux-glibc-arm: build-linux-glibc-arm:
runs-on: ubuntu-20.04 runs-on: ubuntu-18.04
steps: steps:
- name: Set up build environment - name: Set up build environment
run: | run: |
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
cat <<-EOF | sudo tee /etc/apt/sources.list.d/armhf.list >/dev/null cat <<-EOF | sudo tee /etc/apt/sources.list.d/armhf.list >/dev/null
deb [arch=armhf] http://ports.ubuntu.com/ focal main restricted deb [arch=armhf] http://ports.ubuntu.com/ bionic main restricted
deb [arch=armhf] http://ports.ubuntu.com/ focal-updates main restricted deb [arch=armhf] http://ports.ubuntu.com/ bionic-updates main restricted
deb [arch=armhf] http://ports.ubuntu.com/ focal universe deb [arch=armhf] http://ports.ubuntu.com/ bionic universe
deb [arch=armhf] http://ports.ubuntu.com/ focal-updates universe deb [arch=armhf] http://ports.ubuntu.com/ bionic-updates universe
deb [arch=armhf] http://ports.ubuntu.com/ focal multiverse deb [arch=armhf] http://ports.ubuntu.com/ bionic multiverse
deb [arch=armhf] http://ports.ubuntu.com/ focal-updates multiverse deb [arch=armhf] http://ports.ubuntu.com/ bionic-updates multiverse
deb [arch=armhf] http://ports.ubuntu.com/ focal-backports main restricted universe multiverse
EOF EOF
sudo sed -i 's/deb h/deb [arch=amd64] h/g' /etc/apt/sources.list sudo sed -i 's/deb h/deb [arch=amd64] h/g' /etc/apt/sources.list
@ -193,7 +191,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: configure - name: configure
run: env CFLAGS="-O2 -arch x86_64 -mmacosx-version-min=10.10" LDFLAGS="-arch x86_64 -mmacosx-version-min=10.10" ./configure --host=arm-apple-darwin20 --prefix=$PWD/.libsodium-build run: env CFLAGS="-Ofast -arch x86_64 -mmacosx-version-min=10.10" LDFLAGS="-arch x86_64 -mmacosx-version-min=10.10" ./configure --host=arm-apple-darwin20 --prefix=$PWD/.libsodium-build
- name: make - name: make
run: make run: make
- name: make check - name: make check
@ -210,7 +208,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: configure - name: configure
run: env CFLAGS="-O2 -arch arm64 -mmacosx-version-min=10.10" LDFLAGS="-arch arm64 -mmacosx-version-min=10.10" ./configure --host=arm-apple-darwin20 --prefix=$PWD/.libsodium-build run: env CFLAGS="-Ofast -arch arm64 -mmacosx-version-min=10.10" LDFLAGS="-arch arm64 -mmacosx-version-min=10.10" ./configure --host=arm-apple-darwin20 --prefix=$PWD/.libsodium-build
- name: make - name: make
run: make run: make
- name: make install - name: make install
@ -363,7 +361,7 @@ jobs:
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
# On virtualization systems such as the one used by WSL2, the ARM crypto extensions # On virtualization systems such as the one used by WSL2, the ARM crypto extensions
# don't work as expected. As a result, installing Ubuntu 20.04 fails during integrity # don't work as expected. As a result, installing Ubuntu 18.04 fails during integrity
# checks. As a workaround, the following command disables hardware acceleration for # checks. As a workaround, the following command disables hardware acceleration for
# gcrypt, which the apt-get command relies on. # gcrypt, which the apt-get command relies on.
mkdir -p /etc/gcrypt && echo all >> /etc/gcrypt/hwf.deny mkdir -p /etc/gcrypt && echo all >> /etc/gcrypt/hwf.deny
@ -375,7 +373,6 @@ jobs:
deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-updates universe deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-updates universe
deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal multiverse deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal multiverse
deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-updates multiverse deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-updates multiverse
deb [arch=armhf,arm64] http://ports.ubuntu.com/ focal-backports main restricted universe multiverse
EOF EOF
sudo sed -i 's/deb h/deb [arch=amd64] h/g' /etc/apt/sources.list sudo sed -i 's/deb h/deb [arch=amd64] h/g' /etc/apt/sources.list