From c3a334f8df3664f04fb450e008350df89b75a9ff Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Mon, 9 Dec 2024 12:32:03 +0530 Subject: [PATCH] 1) Update the repo to the version 2.0 for downloading EPAS. 2) Use 'ubuntu-22.04' instead of 'ubuntu-latest'. --- .github/workflows/check-container-build.yml | 2 +- .github/workflows/check-doc-builds.yml | 2 +- .github/workflows/check-javascript-style.yml | 2 +- .github/workflows/check-python-build.yml | 2 +- .github/workflows/check-python-style.yml | 2 +- .github/workflows/check-tarball-build.yml | 2 +- .github/workflows/check-translations.yml | 2 +- .github/workflows/run-feature-tests-epas.yml | 6 ++---- .github/workflows/run-feature-tests-pg.yml | 2 +- .github/workflows/run-javascript-tests.yml | 2 +- .github/workflows/run-python-tests-epas.yml | 4 +--- .github/workflows/run-python-tests-pg.yml | 18 +++++++++--------- .github/workflows/sonarqube-scan.yml | 2 +- 13 files changed, 22 insertions(+), 26 deletions(-) diff --git a/.github/workflows/check-container-build.yml b/.github/workflows/check-container-build.yml index 0d894420abb..0b1fe6df856 100644 --- a/.github/workflows/check-container-build.yml +++ b/.github/workflows/check-container-build.yml @@ -14,7 +14,7 @@ concurrency: jobs: build-container: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/check-doc-builds.yml b/.github/workflows/check-doc-builds.yml index 9283322bfd1..df20b73d59c 100644 --- a/.github/workflows/check-doc-builds.yml +++ b/.github/workflows/check-doc-builds.yml @@ -14,7 +14,7 @@ concurrency: jobs: build-docs: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/check-javascript-style.yml b/.github/workflows/check-javascript-style.yml index eebc29e11b2..3437a123535 100644 --- a/.github/workflows/check-javascript-style.yml +++ b/.github/workflows/check-javascript-style.yml @@ -14,7 +14,7 @@ concurrency: jobs: check-javascript-style: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/check-python-build.yml b/.github/workflows/check-python-build.yml index e1d9ab9824d..8d343ec438f 100644 --- a/.github/workflows/check-python-build.yml +++ b/.github/workflows/check-python-build.yml @@ -14,7 +14,7 @@ concurrency: jobs: build-python-package: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/check-python-style.yml b/.github/workflows/check-python-style.yml index 8ecc665e319..5637f54ba5b 100644 --- a/.github/workflows/check-python-style.yml +++ b/.github/workflows/check-python-style.yml @@ -14,7 +14,7 @@ concurrency: jobs: check-python-style: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/check-tarball-build.yml b/.github/workflows/check-tarball-build.yml index bfe242ddb2d..ab8a6af2ef2 100644 --- a/.github/workflows/check-tarball-build.yml +++ b/.github/workflows/check-tarball-build.yml @@ -14,7 +14,7 @@ concurrency: jobs: build-tarball: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/check-translations.yml b/.github/workflows/check-translations.yml index c0376f488bd..3cdffd1d17b 100644 --- a/.github/workflows/check-translations.yml +++ b/.github/workflows/check-translations.yml @@ -14,7 +14,7 @@ concurrency: jobs: check-translations: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/run-feature-tests-epas.yml b/.github/workflows/run-feature-tests-epas.yml index e7c4142939b..d23c4e0d31f 100644 --- a/.github/workflows/run-feature-tests-epas.yml +++ b/.github/workflows/run-feature-tests-epas.yml @@ -23,16 +23,14 @@ jobs: matrix: pgver: [12, 13, 14, 15, 16] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Setup the EDB APT repo on Linux run: | - sudo su -c 'echo "deb [arch=amd64] https://apt.enterprisedb.com/$(lsb_release -cs)-edb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/edb-$(lsb_release -cs).list' - sudo su -c 'echo "machine apt.enterprisedb.com login ${{ secrets.EDB_REPO_USERNAME }} password ${{ secrets.EDB_REPO_PASSWORD }}" > /etc/apt/auth.conf.d/edb.conf' - sudo wget -q -O - https://apt.enterprisedb.com/edb-deb.gpg.key | sudo apt-key add - + curl -1sLf 'https://downloads.enterprisedb.com/${{ secrets.CLOUDSMITH_TOKEN }}/enterprise/setup.deb.sh' | sudo -E bash - name: Install platform dependencies run: | diff --git a/.github/workflows/run-feature-tests-pg.yml b/.github/workflows/run-feature-tests-pg.yml index 20139166408..72af1a3608f 100644 --- a/.github/workflows/run-feature-tests-pg.yml +++ b/.github/workflows/run-feature-tests-pg.yml @@ -22,7 +22,7 @@ jobs: matrix: pgver: [12, 13, 14, 15, 16] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/run-javascript-tests.yml b/.github/workflows/run-javascript-tests.yml index 362c53eaccf..4a16fd20993 100644 --- a/.github/workflows/run-javascript-tests.yml +++ b/.github/workflows/run-javascript-tests.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-latest, ubuntu-22.04, windows-latest] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/run-python-tests-epas.yml b/.github/workflows/run-python-tests-epas.yml index 53f15553b12..5f74c1297fc 100644 --- a/.github/workflows/run-python-tests-epas.yml +++ b/.github/workflows/run-python-tests-epas.yml @@ -42,9 +42,7 @@ jobs: - name: Setup the EDB APT repo on Linux if: ${{ matrix.os == 'ubuntu-22.04' }} run: | - sudo su -c 'echo "deb [arch=amd64] https://apt.enterprisedb.com/$(lsb_release -cs)-edb/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/edb-$(lsb_release -cs).list' - sudo su -c 'echo "machine apt.enterprisedb.com login ${{ secrets.EDB_REPO_USERNAME }} password ${{ secrets.EDB_REPO_PASSWORD }}" > /etc/apt/auth.conf.d/edb.conf' - sudo wget -q -O - https://apt.enterprisedb.com/edb-deb.gpg.key | sudo apt-key add - + curl -1sLf 'https://downloads.enterprisedb.com/${{ secrets.CLOUDSMITH_TOKEN }}/enterprise/setup.deb.sh' | sudo -E bash - name: Install platform dependencies on Linux if: ${{ matrix.os == 'ubuntu-22.04' }} diff --git a/.github/workflows/run-python-tests-pg.yml b/.github/workflows/run-python-tests-pg.yml index fd7166e123c..70a300c7dcb 100644 --- a/.github/workflows/run-python-tests-pg.yml +++ b/.github/workflows/run-python-tests-pg.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-latest, ubuntu-22.04, windows-latest] pgver: [12, 13, 14, 15, 16] runs-on: ${{ matrix.os }} @@ -29,13 +29,13 @@ jobs: - uses: actions/checkout@v4 - name: Setup the PGDG APT repo on Linux - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'ubuntu-22.04' }} run: | sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - - name: Install platform dependencies on Linux - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'ubuntu-22.04' }} run: | sudo apt update sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev postgresql-${{ matrix.pgver }} postgresql-${{ matrix.pgver }}-pldebugger pgagent @@ -68,7 +68,7 @@ jobs: shell: cmd - name: Create the tablespace directory on Linux - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'ubuntu-22.04' }} run: | sudo mkdir -p /var/lib/postgresql/tablespaces/${{ matrix.pgver }} sudo chown postgres:postgres /var/lib/postgresql/tablespaces/${{ matrix.pgver }} @@ -86,7 +86,7 @@ jobs: shell: cmd - name: Start PostgreSQL on Linux - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'ubuntu-22.04' }} run: | sudo su -c "echo local all all trust > /etc/postgresql/${{ matrix.pgver }}/main/pg_hba.conf" sudo sed -i "s/port = 543[0-9]/port = 59${{ matrix.pgver }}/g" /etc/postgresql/${{ matrix.pgver }}/main/postgresql.conf @@ -116,7 +116,7 @@ jobs: psql postgres -p 59${{ matrix.pgver }} -c 'CREATE ROLE postgres SUPERUSER LOGIN;' - name: Install Python dependencies on Linux and macOS - if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }} run: make install-python-testing - name: Install Python dependencies on Windows @@ -131,7 +131,7 @@ jobs: shell: cmd - name: Create the test configuration on Linux and macOS - if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }} run: | cat < web/config_local.py from config import * @@ -181,7 +181,7 @@ jobs: "name": "PostgreSQL ${{ matrix.pgver }}", "comment": "PostgreSQL ${{ matrix.pgver }} Server", "db_username": "postgres", - "host": "${{ matrix.os == 'macos-latest' && '/tmp' || matrix.os == 'ubuntu-latest' && '/var/run/postgresql' || '127.0.0.1' }}", + "host": "${{ matrix.os == 'macos-latest' && '/tmp' || matrix.os == 'ubuntu-22.04' && '/var/run/postgresql' || '127.0.0.1' }}", "db_password": "postgres", "db_port": 59${{ matrix.pgver }}, "maintenance_db": "postgres", @@ -278,7 +278,7 @@ jobs: shell: cmd - name: Run the tests on Linux and macOS - if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'macos-latest' || matrix.os == 'ubuntu-22.04' }} run: | . venv/bin/activate make check-python diff --git a/.github/workflows/sonarqube-scan.yml b/.github/workflows/sonarqube-scan.yml index 66a16736c1d..77b37441c74 100644 --- a/.github/workflows/sonarqube-scan.yml +++ b/.github/workflows/sonarqube-scan.yml @@ -22,7 +22,7 @@ jobs: # Only run if the project key is set if: vars.SONARQUBE_PROJECT_KEY != null - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4