From 7e7fba1b209bca59c098e6bda59c25018399ea94 Mon Sep 17 00:00:00 2001 From: shum Date: Wed, 9 Apr 2025 14:11:18 +0400 Subject: [PATCH 1/2] ci: install postgresql tools in runner --- .github/workflows/build.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 451de173ba..4703cfde53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,6 +48,19 @@ jobs: - name: Set up Docker Buildx uses: simplex-chat/docker-setup-buildx-action@v3 + - name: Install PostgreSQL 15 client tools + if: matrix.os == '22.04' + shell: bash + run: | + # Import the repository signing key + sudo install -d /usr/share/postgresql-common/pgdg + sudo curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc + # Add the PostgreSQL APT repository + sudo sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' + # Update repository and install postgresql tools + sudo apt update + sudo apt -y install postgresql-client-15 + - name: Build and cache Docker image uses: simplex-chat/docker-build-push-action@v6 with: From 3849714f7e924c3a149261351cd2c8877f759130 Mon Sep 17 00:00:00 2001 From: shum Date: Wed, 9 Apr 2025 10:50:42 +0000 Subject: [PATCH 2/2] ci: docker shell abort on error --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4703cfde53..8ee1d75eca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,7 +95,7 @@ jobs: build/${{ matrix.platform_name }}:latest - name: Build smp-server (postgresql) and tests - shell: docker exec -t builder sh {0} + shell: docker exec -t builder sh -eu {0} run: | cabal update cabal build --jobs=$(nproc) --enable-tests -fserver_postgres @@ -119,7 +119,7 @@ jobs: docker cp builder:/out/smp-server ./smp-server-postgres-ubuntu-${{ matrix.platform_name }} - name: Build everything else (standard) - shell: docker exec -t builder sh {0} + shell: docker exec -t builder sh -eu {0} run: | cabal build --jobs=$(nproc) mkdir -p /out