diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 702bf76bd..6313ba1e8 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -46,22 +46,6 @@ jobs: sudo apt-get update sudo apt-get install -y --no-install-recommends ripgrep - sudo install -d /usr/share/postgresql-common/pgdg - sudo curl --fail --silent --show-error --location \ - https://www.postgresql.org/media/keys/ACCC4CF8.asc \ - --output /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc - - . /etc/os-release - echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt ${VERSION_CODENAME}-pgdg main" \ - | sudo tee /etc/apt/sources.list.d/pgdg.list - - sudo apt-get update - sudo apt-get install -y --no-install-recommends postgresql-client-18 - - echo "/usr/lib/postgresql/18/bin" >> $GITHUB_PATH - - pg_dump --version - pg_restore --version - name: Ensure contract baseline ref run: | diff --git a/tools/cloud-setup.sh b/tools/cloud-setup.sh index 960b5fdb5..666155e56 100755 --- a/tools/cloud-setup.sh +++ b/tools/cloud-setup.sh @@ -19,7 +19,7 @@ export DEBIAN_FRONTEND=noninteractive $SUDO apt-get update $SUDO apt-get install -y --no-install-recommends \ - ca-certificates curl git build-essential ripgrep gnupg lsb-release + ca-certificates curl git build-essential ripgrep if ! go version 2>/dev/null | grep -q "go$GO_VERSION "; then arch=$(dpkg --print-architecture) @@ -37,15 +37,6 @@ if ! node --version 2>/dev/null | grep -q "^v$NODE_MAJOR\."; then $SUDO apt-get install -y nodejs fi -# pg_dump/pg_restore 18 are used by the gate. -$SUDO install -d /usr/share/postgresql-common/pgdg -$SUDO curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \ - -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc -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" \ - | $SUDO tee /etc/apt/sources.list.d/pgdg.list >/dev/null -$SUDO apt-get update -$SUDO apt-get install -y --no-install-recommends postgresql-client-18 - go install "github.com/go-task/task/v3/cmd/task@$TASK_VERSION" go install "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$GOLANGCI_VERSION" go install "mvdan.cc/gofumpt@$GOFUMPT_VERSION"