Skip to content

Commit af562d7

Browse files
committed
Fix Docker build context in CI to ensure e2ebase image is available for dependent builds. Remove unnecessary venv setup.
1 parent c207208 commit af562d7

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

.github/workflows/e2e.yaml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@ jobs:
2727
cache: npm
2828
cache-dependency-path: test/e2e/package-lock.json
2929

30-
- name: Create Python venv and install dependencies
30+
- name: Install Python dependencies
3131
working-directory: test/e2e
32-
run: |
33-
python -m venv .venv
34-
source .venv/bin/activate
35-
pip install -r requirements.txt
36-
echo "VIRTUAL_ENV=$(pwd)/.venv" >> $GITHUB_ENV
37-
echo "$(pwd)/.venv/bin" >> $GITHUB_PATH
32+
run: pip install -r requirements.txt
3833

3934
- name: Install npm dependencies
4035
working-directory: test/e2e
@@ -47,16 +42,14 @@ jobs:
4742

4843
- name: Build Docker images
4944
run: |
50-
source test/e2e/.venv/bin/activate
51-
cd test/e2e
52-
just build-images
45+
docker build -f test/e2e/Dockerfile.base -t e2ebase .
46+
docker compose -f test/e2e/docker-compose.yml build connect-publisher-e2e code-server
5347
env:
5448
CONNECT_LICENSE: ${{ secrets.CONNECT_LICENSE }}
5549

5650
- name: Run Cypress tests
5751
working-directory: test/e2e
5852
run: |
59-
source .venv/bin/activate
6053
just start "connect-publisher-e2e"
6154
just start "code-server"
6255
npx cypress run
@@ -83,6 +76,4 @@ jobs:
8376
- name: Stop containers
8477
if: always()
8578
working-directory: test/e2e
86-
run: |
87-
source .venv/bin/activate
88-
just stop
79+
run: just stop

0 commit comments

Comments
 (0)