diff --git a/.github/workflows/check-javascript-style.yml b/.github/workflows/check-javascript-style.yml index 6c4a636d7..5ca88c369 100644 --- a/.github/workflows/check-javascript-style.yml +++ b/.github/workflows/check-javascript-style.yml @@ -19,17 +19,8 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install platform dependencies - run: | - sudo apt update - sudo apt install -y nodejs npm - - - name: Install Node dependencies - run: sudo npm install --global yarn - - name: Install Node modules run: | - export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" cd web yarn install diff --git a/.github/workflows/check-python-build.yml b/.github/workflows/check-python-build.yml index 7fdd2cd0f..597f36605 100644 --- a/.github/workflows/check-python-build.yml +++ b/.github/workflows/check-python-build.yml @@ -22,16 +22,15 @@ jobs: - name: Install platform dependencies run: | sudo apt update - sudo apt install -y build-essential python3-dev python3-pip libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev + sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev - name: Install Python dependencies - run: | - sudo pip install --upgrade pip - sudo pip install -r requirements.txt - sudo pip install "pyOpenSSL>=23.*" sphinx sphinxcontrib-youtube + run: make install-python - name: Check the Python wheel build - run: make pip + run: | + . venv/bin/activate + make pip - name: Archive Python wheel uses: actions/upload-artifact@v3 diff --git a/.github/workflows/check-python-style.yml b/.github/workflows/check-python-style.yml index 68a2937e6..6c32d5fa3 100644 --- a/.github/workflows/check-python-style.yml +++ b/.github/workflows/check-python-style.yml @@ -19,11 +19,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install platform dependencies - run: | - sudo apt update - sudo apt install -y python3-pip - - name: Install Python dependencies run: | sudo pip install --upgrade pip diff --git a/.github/workflows/check-tarball-build.yml b/.github/workflows/check-tarball-build.yml index a70b9d3ae..3db81e221 100644 --- a/.github/workflows/check-tarball-build.yml +++ b/.github/workflows/check-tarball-build.yml @@ -22,16 +22,15 @@ jobs: - name: Install platform dependencies run: | sudo apt update - sudo apt install -y build-essential python3-dev python3-pip libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev + sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev - name: Install Python dependencies - run: | - sudo pip install --upgrade pip - sudo pip install -r requirements.txt - sudo pip install "pyOpenSSL>=23.*" sphinx sphinxcontrib-youtube + run: make install-python - name: Check the tarball build - run: make src + run: | + . venv/bin/activate + make src - name: Archive source tarball uses: actions/upload-artifact@v3 diff --git a/.github/workflows/run-python-tests-epas.yml b/.github/workflows/run-python-tests-epas.yml index ecfcdd459..6046c9b7f 100644 --- a/.github/workflows/run-python-tests-epas.yml +++ b/.github/workflows/run-python-tests-epas.yml @@ -36,6 +36,7 @@ jobs: 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 - + - name: Install platform dependencies run: | PACKAGES= @@ -44,7 +45,8 @@ jobs: PACKAGES="${PACKAGES} edb-as${VERSION}-server edb-as${VERSION}-server-pldebugger edb-as${VERSION}-pgagent" done sudo apt update - sudo apt install -y build-essential python3-dev python3-pip libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev ${PACKAGES} + sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev ${PACKAGES} + - name: Create the tablespace directory run: | for VERSION in ${POSTGRESQL_VERSIONS}; @@ -52,6 +54,7 @@ jobs: sudo mkdir -p /var/lib/edb-as/tablespaces/${VERSION} sudo chown enterprisedb:enterprisedb /var/lib/edb-as/tablespaces/${VERSION} done + - name: Start PostgreSQL run: | # Note: we use a custom port for PostgreSQL as the runner may already have a version of PostgreSQL installed @@ -72,10 +75,8 @@ jobs: done - name: Install Python dependencies - run: | - sudo pip install --upgrade pip - sudo pip install -r web/regression/requirements.txt - sudo pip install "pyOpenSSL>=23.*" + run: make install-python-testing + - name: Create the test configuration run: | cat < web/config_local.py @@ -166,7 +167,9 @@ jobs: } EOF - name: Run the tests - run: make check-python + run: | + . venv/bin/activate + make check-python - name: Archive server log if: success() || failure() diff --git a/.github/workflows/run-python-tests-pg.yml b/.github/workflows/run-python-tests-pg.yml index 82936619f..c15a8c309 100644 --- a/.github/workflows/run-python-tests-pg.yml +++ b/.github/workflows/run-python-tests-pg.yml @@ -32,7 +32,7 @@ jobs: done sudo apt update - sudo apt install -y build-essential python3-dev python3-pip libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev ${PACKAGES} pgagent + sudo apt install -y libpq-dev libffi-dev libssl-dev libkrb5-dev zlib1g-dev ${PACKAGES} pgagent - name: Create the tablespace directory run: | @@ -62,10 +62,7 @@ jobs: done - name: Install Python dependencies - run: | - sudo pip install --upgrade pip - sudo pip install -r web/regression/requirements.txt - sudo pip install "pyOpenSSL>=23.*" + run: make install-python - name: Create the test configuration run: | @@ -158,7 +155,9 @@ jobs: EOF - name: Run the tests - run: make check-python + run: | + . venv/bin/activate + make check-python - name: Archive server log if: success() || failure()