diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 599dd30a36..f5199e6600 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -167,26 +167,26 @@ jobs: image: "geotrek:latest" build_deb_22_04: - name: Build 22.04 package - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Prepare debian 22.04 versioning - run: | - sed -i 's/+dev/.ubuntu22.04~dev'$GITHUB_RUN_ID'/' debian/changelog - sed -i 's/geotrek-admin (\([0-9]\+\.[0-9]\+\.[0-9]\+\)\(.*\)) RELEASED;/geotrek-admin (\1.ubuntu22.04\2) jammy;/' debian/changelog - - - name: Building package debian 22.04 - run: | - DISTRO=ubuntu:jammy make build_deb - cp ./dpkg/*.deb /home/runner/work/Geotrek-admin/ - - - name: Archive package artifact - uses: actions/upload-artifact@v3 - with: - name: debian-22-04 - path: | - /home/runner/work/Geotrek-admin/*.deb + name: Build 22.04 package + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Prepare debian 22.04 versioning + run: | + sed -i 's/+dev/.ubuntu22.04~dev'$GITHUB_RUN_ID'/' debian/changelog + sed -i 's/geotrek-admin (\([0-9]\+\.[0-9]\+\.[0-9]\+\)\(.*\)) RELEASED;/geotrek-admin (\1.ubuntu22.04\2) jammy;/' debian/changelog + + - name: Building package debian 22.04 + run: | + DISTRO=ubuntu:jammy make build_deb + cp ./dpkg/*.deb /home/runner/work/Geotrek-admin/ + + - name: Archive package artifact + uses: actions/upload-artifact@v3 + with: + name: debian-22-04 + path: | + /home/runner/work/Geotrek-admin/*.deb build_deb_20_04: name: Build 20.04 package diff --git a/docker/Dockerfile.debian.builder b/docker/Dockerfile.debian.builder index 45fd881c82..bf31dff10a 100644 --- a/docker/Dockerfile.debian.builder +++ b/docker/Dockerfile.debian.builder @@ -6,7 +6,7 @@ FROM ${DISTRO} as base RUN apt-get update -qq -o Acquire::Languages=none && \ env DEBIAN_FRONTEND=noninteractive apt-get install -yqq lsb-release && \ if test "$(lsb_release -cs)" = 'focal' ; then \ - env DEBIAN_FRONTEND=noninteractive apt-get install -yqq software-properties-common wget; \ + env DEBIAN_FRONTEND=noninteractive apt-get install -yqq software-properties-common wget && \ printf "deb [arch=amd64] https://packages.geotrek.fr/ubuntu bionic main" > /etc/apt/sources.list.d/geotrek.list && \ wget -O- "https://packages.geotrek.fr/geotrek.gpg.key" | apt-key add - && \ add-apt-repository ppa:jyrki-pulliainen/dh-virtualenv; fi &&\